From: Francesco Riosa Date: Tue, 2 Jan 2007 10:21:12 +0000 (+0000) Subject: mysql/ X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe1d64903a68190916c21d9fdc94f5242bcb2b55;p=gentoo.git mysql/ --- diff --git a/sys-apps/mysql/ChangeLog b/sys-apps/mysql/ChangeLog new file mode 100644 index 000000000000..f0a82714885d --- /dev/null +++ b/sys-apps/mysql/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for sys-apps/mysql +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/ChangeLog,v 1.1 2007/01/02 10:21:12 vivo Exp $ + +*mysql-1 (02 Jan 2007) + + 02 Jan 2007; Francesco Riosa +files/my.cnf-4.0, + +files/my.cnf-4.1, +files/logrotate.mysql, +files/mysql.conf.d, + +files/mysql.init, +files/mysql.rc6, +files/mysqlmanager.conf.d, + +files/mysqlmanager.rc6, +mysql-1.ebuild: + Initial commit, this package will manage etc/{init,conf}.d/mysql* files + diff --git a/sys-apps/mysql/Manifest b/sys-apps/mysql/Manifest new file mode 100644 index 000000000000..5491a3564442 --- /dev/null +++ b/sys-apps/mysql/Manifest @@ -0,0 +1,43 @@ +AUX logrotate.mysql 440 RMD160 fbf0bc4b0b6c3ac611c6a3b916db36647016013d SHA1 11f83890c53fe80702e4a9aa3c4ed4cf5ba6dfcc SHA256 dafc74057585e50abdc682f1cf756d1cf4342df51f140880181dbb11f07afba1 +MD5 e61a6d6aaa65503bddf57f77a65dd5ba files/logrotate.mysql 440 +RMD160 fbf0bc4b0b6c3ac611c6a3b916db36647016013d files/logrotate.mysql 440 +SHA256 dafc74057585e50abdc682f1cf756d1cf4342df51f140880181dbb11f07afba1 files/logrotate.mysql 440 +AUX my.cnf-4.0 4293 RMD160 cbe4ea7688059f48145af2b49f6530452d076736 SHA1 58d8abc9c02f0546d320baa89b739c79555fe963 SHA256 b479299cda817cbda77f8f43d79e23120a7569a3165b0c98ddcedfee7c0900a3 +MD5 4e4cb485529453d68e468d52d0f24523 files/my.cnf-4.0 4293 +RMD160 cbe4ea7688059f48145af2b49f6530452d076736 files/my.cnf-4.0 4293 +SHA256 b479299cda817cbda77f8f43d79e23120a7569a3165b0c98ddcedfee7c0900a3 files/my.cnf-4.0 4293 +AUX my.cnf-4.1 4212 RMD160 86a7b4aaf70b4a4321419a7616c6f8276a1530a1 SHA1 5c68c2ccfbb05c3547a3e5a6554839c27496bcb4 SHA256 7460667229e18b1f0e446105431e7ae31177e3e7774ff6736eba8b057cd3fc80 +MD5 a81fb39bb23727683a8d8a717cb74a9d files/my.cnf-4.1 4212 +RMD160 86a7b4aaf70b4a4321419a7616c6f8276a1530a1 files/my.cnf-4.1 4212 +SHA256 7460667229e18b1f0e446105431e7ae31177e3e7774ff6736eba8b057cd3fc80 files/my.cnf-4.1 4212 +AUX mysql.conf.d 3273 RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 SHA1 64e9bb80099bf6e14a07764fcb69bb02682aee0b SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c +MD5 092bb6cad90a875da8899e104304c969 files/mysql.conf.d 3273 +RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 files/mysql.conf.d 3273 +SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c files/mysql.conf.d 3273 +AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 +MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 +RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 files/mysql.init 886 +SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 files/mysql.init 886 +AUX mysql.rc6 10624 RMD160 29e5ff0a795fe5788b39a1cb27ed297db37a4ad0 SHA1 adabb3184ccf42d58ab25f63377d30e94adfb132 SHA256 f840b9718ac957fd513021b0bc5b22d067e221f96cd9d797b94eae0c03c3c236 +MD5 f1adf5702b9517ad43157c7291fda3e8 files/mysql.rc6 10624 +RMD160 29e5ff0a795fe5788b39a1cb27ed297db37a4ad0 files/mysql.rc6 10624 +SHA256 f840b9718ac957fd513021b0bc5b22d067e221f96cd9d797b94eae0c03c3c236 files/mysql.rc6 10624 +AUX mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 SHA1 0d82531df24ba4f0d957176b6fa0076a1cae0356 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 +MD5 c94178cadec3be56c4e6c7ec9812cfcf files/mysqlmanager.conf.d 1009 +RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 files/mysqlmanager.conf.d 1009 +SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 files/mysqlmanager.conf.d 1009 +AUX mysqlmanager.rc6 6617 RMD160 a1306938ff11e18a9852a2546aaec34490d8a5e9 SHA1 62033f95762be615b451ffa89b5e1538aed82392 SHA256 bf83fdd06ca9615545e6aafd7a3abb06cac92a5854284bdde337f77d98329e55 +MD5 44dff672094af9d6c679a6aa8d9411b3 files/mysqlmanager.rc6 6617 +RMD160 a1306938ff11e18a9852a2546aaec34490d8a5e9 files/mysqlmanager.rc6 6617 +SHA256 bf83fdd06ca9615545e6aafd7a3abb06cac92a5854284bdde337f77d98329e55 files/mysqlmanager.rc6 6617 +EBUILD mysql-1.ebuild 679 RMD160 ca6582aecc804d057b0954f2f0f5861735352e22 SHA1 74b6560e685f6439c9585976c2a4fa751c974240 SHA256 0c745aae2a4d3b21cd932ac68501f3bc2010177c965bb0ee45091255ce063f97 +MD5 a4fc867976efdd1630df89b881a64e60 mysql-1.ebuild 679 +RMD160 ca6582aecc804d057b0954f2f0f5861735352e22 mysql-1.ebuild 679 +SHA256 0c745aae2a4d3b21cd932ac68501f3bc2010177c965bb0ee45091255ce063f97 mysql-1.ebuild 679 +MISC ChangeLog 235 RMD160 1178964162231ab9453b620db14861f2c777701c SHA1 dea9d19472bb27577f530d1f7b0252c975ac3878 SHA256 e745b2328b0bba21c8479d198130a8cc81f0566d957ccc5242555290f5b5873e +MD5 c6413a12c11edb981ef08b83b7354b67 ChangeLog 235 +RMD160 1178964162231ab9453b620db14861f2c777701c ChangeLog 235 +SHA256 e745b2328b0bba21c8479d198130a8cc81f0566d957ccc5242555290f5b5873e ChangeLog 235 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-1 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-1 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-1 0 diff --git a/sys-apps/mysql/files/digest-mysql-1 b/sys-apps/mysql/files/digest-mysql-1 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys-apps/mysql/files/logrotate.mysql b/sys-apps/mysql/files/logrotate.mysql new file mode 100644 index 000000000000..a2be4d392aa1 --- /dev/null +++ b/sys-apps/mysql/files/logrotate.mysql @@ -0,0 +1,15 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/files/logrotate.mysql,v 1.1 2007/01/02 10:21:12 vivo Exp $ + +/var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err { +monthly +create 660 mysql mysql +notifempty +size 5M +sharedscripts +missingok +postrotate +/bin/kill -HUP `cat /var/run/mysqld/mysqld.pid` +endscript +} diff --git a/sys-apps/mysql/files/my.cnf-4.0 b/sys-apps/mysql/files/my.cnf-4.0 new file mode 100644 index 000000000000..6cbcf667df91 --- /dev/null +++ b/sys-apps/mysql/files/my.cnf-4.0 @@ -0,0 +1,112 @@ +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/files/my.cnf-4.0,v 1.1 2007/01/02 10:21:12 vivo Exp $ +# +# This file can be simultaneously placed in three places: +# 1. /etc/mysql/my.cnf to set global options. +# 2. /var/lib/mysql/my.cnf to set server-specific options. +# 3. ~/.my.cnf to set user-specific options. +# +# One can use all long options that the program supports. +# Run the program with --help to get a list of them. +# +# The following values assume you have at least 64M RAM! + +[client] +#password = my_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +[safe_mysqld] +err-log = /var/log/mysql/mysql.err + +[mysqld] +user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +log-error = /var/log/mysql/mysqld.err +# If set, mysql logs all queries (general query log). This will be deprecated in +# MySQL 5.0. This logs all queries, even error queries and is slow. +# log = /var/log/mysql/mysql.log +# +# If you really need logging, you'd rather use binary logging. Especially when doing +# replication. Read file:/usr/share/doc/mysql-*/manual.html.gz#Replication for info. +# You can use PURGE MASTER LOGS TO '$hostname-bin.010' to get rid of old logs +# from $hostname-bin.01 up to $hostname-bin.09 while the slave server is +# running. +# Before doing that, check which logfile slave curently uses by running +# mysql> SHOW SLAVE STATUS +# To list logfiles on master do: +# mysql> SHOW MASTER LOGS +# Then use PURGE for those not needed anymore only! Never remove the files +# manually! +# +# Also consult RESET MASTER and RESET SLAVE commands before doing any changes +# mysql> RESET MASTER - Deletes all binary logs listed in the index +# file, resetting the binlog index file to be empty. +# mysql> RESET SLAVE - Makes the slave forget its replication position in +# the master logs. +# mysql> SET SQL_LOG_BIN=0 - this turns off logging (execute on MASTER only) +# mysql> SET SQL_LOG_BIN=1 - this turns on logging (execute on MASTER only) +# +# log-bin +# set-variable = binlog-do-db=non_existant +# set-variable = binlog-ignore-db=database_name +# +# server-id has to unique for each master or slave in your network, +# lets use the last number from IP address +# server-id = 207 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +language = /usr/share/mysql/english +skip-locking +set-variable = key_buffer=16M +set-variable = max_allowed_packet=1M +set-variable = thread_stack=128K +# be secure by default! +bind-address = 127.0.0.1 +port = 3306 +# this can make it even more secure: +#skip-networking +# +# the following is the InnoDB configuration +# if you wish to disable innodb instead +# uncomment just the next line +#skip-innodb +# +# the rest of the innodb config follows: +# don't eat too much memory, we're trying to be safe on 64Mb boxes +# you might want to bump this up a bit on boxes with more RAM +set-variable = innodb_buffer_pool_size=32M +# this is the default, increase it if you have lots of tables +set-variable = innodb_additional_mem_pool_size=1M +# +# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( +# and upstream wants things to be under /var/lib/mysql/, so that's the route +# we have to take for the moment +innodb_data_home_dir = /var/lib/mysql/ +innodb_log_arch_dir = /var/lib/mysql/ +innodb_log_group_home_dir = /var/lib/mysql/ +# you may wish to change this size to be more suitable for your system +# the max is there to avoid run-away growth on your machine +innodb_data_file_path = ibdata1:10M:autoextend:max:128M +# we keep this at around 25% of of innodb_buffer_pool_size +# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) +set-variable = innodb_log_file_size=8M +# this is the default, increase it if you have very large transactions going on +set-variable = innodb_log_buffer_size=1M +# this is the default and won't hurt you +# you shouldn't need to tweak it +set-variable = innodb_log_files_in_group=2 +# see the innodb config docs, the other options are not always safe +innodb_flush_log_at_trx_commit = 1 + +[mysqldump] +quick +set-variable = max_allowed_packet=16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completion + +[isamchk] +set-variable = key_buffer=16M diff --git a/sys-apps/mysql/files/my.cnf-4.1 b/sys-apps/mysql/files/my.cnf-4.1 new file mode 100644 index 000000000000..1cfdc3fe58d3 --- /dev/null +++ b/sys-apps/mysql/files/my.cnf-4.1 @@ -0,0 +1,146 @@ +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/files/my.cnf-4.1,v 1.1 2007/01/02 10:21:12 vivo Exp $ + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +[mysql] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqladmin] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlcheck] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqldump] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlimport] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlshow] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[myisamchk] +character-sets-dir=/usr/share/mysql/charsets + +[myisampack] +character-sets-dir=/usr/share/mysql/charsets + +# use [safe_mysqld] with mysql-3 +[mysqld_safe] +err-log = /var/log/mysql/mysql.err + +# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations +[mysqld] +character-set-server = utf8 +default-character-set = utf8 +user = mysql +port = 3306 +socket = /var/run/mysqld/mysqld.sock +pid-file = /var/run/mysqld/mysqld.pid +log-error = /var/log/mysql/mysqld.err +basedir = /usr +datadir = @DATADIR@ +skip-locking +key_buffer = 16M +max_allowed_packet = 1M +table_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +language = /usr/share/mysql/english + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +bind-address = 127.0.0.1 + +log-bin +server-id = 1 + +# point the following paths to different dedicated disks +tmpdir = /tmp/ +#log-update = /path-to-dedicated-directory/hostname + +# you need the debug USE flag enabled to use the following directives, +# if needed, uncomment them, start the server and issue +# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace +# this will show you *exactly* what's happening in your server ;) + +#log = /tmp/mysqld.sql +#gdb +#debug = d:t:i:o,/tmp/mysqld.trace +#one-thread + +# uncomment the following directives if you are using BDB tables +#bdb_cache_size = 4M +#bdb_max_lock = 10000 + +# the following is the InnoDB configuration +# if you wish to disable innodb instead +# uncomment just the next line +#skip-innodb +# +# the rest of the innodb config follows: +# don't eat too much memory, we're trying to be safe on 64Mb boxes +# you might want to bump this up a bit on boxes with more RAM +innodb_buffer_pool_size = 16M +# this is the default, increase it if you have lots of tables +innodb_additional_mem_pool_size = 2M +# +# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( +# and upstream wants things to be under /var/lib/mysql/, so that's the route +# we have to take for the moment +#innodb_data_home_dir = /var/lib/mysql/ +#innodb_log_arch_dir = /var/lib/mysql/ +#innodb_log_group_home_dir = /var/lib/mysql/ +# you may wish to change this size to be more suitable for your system +# the max is there to avoid run-away growth on your machine +innodb_data_file_path = ibdata1:10M:autoextend:max:128M +# we keep this at around 25% of of innodb_buffer_pool_size +# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) +innodb_log_file_size = 5M +# this is the default, increase it if you have very large transactions going on +innodb_log_buffer_size = 8M +# this is the default and won't hurt you +# you shouldn't need to tweak it +set-variable = innodb_log_files_in_group=2 +# see the innodb config docs, the other options are not always safe +innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[isamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[myisamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/sys-apps/mysql/files/mysql.conf.d b/sys-apps/mysql/files/mysql.conf.d new file mode 100644 index 000000000000..15ff170cc98a --- /dev/null +++ b/sys-apps/mysql/files/mysql.conf.d @@ -0,0 +1,80 @@ +# Here is where we define which server(s) to start. +# Additional parameters to be passed to mysqld at startup may be added here, +# which will override the ones in "my.cnf". +# +# Below are described some suggested parameters to use. +# The parameters not recognized will be passed through to the mysqld daemon +# directly! +# To avoid starting a server just comment it's definition. +# +# Last but not least, SPACES are NOT allowed inside the parameters! +# +# Parameter : description +# ----------------+----------------------------------------------------------- +# nice : integer [-20 .. 19 ] default 0 +# : change the priority of the server -20 (high) to 19 (low) +# : see "man nice 1" for description +# ----------------+----------------------------------------------------------- +# mycnf : string [full path to my.cnf] +# : specify the path to my.cnf file to be used +# ----------------+----------------------------------------------------------- +# startup_timeout : integer [seconds] default 15 +# : time to wait for mysqld up and running, after this it's +# : marked as failed +# ----------------+----------------------------------------------------------- +# +# Additional parameters +# Parameter : description +# ----------------+----------------------------------------------------------- +# server-id : integer [1 .. 255] +# : Uniquely identifies the server instance in the community +# : of replication partners. +# ----------------+----------------------------------------------------------- +# port : integer [1025 .. 65535] default 3306 +# : Port number to use for connection. +# : Looses any meaning if skip-networking is set. +# ----------------+----------------------------------------------------------- +# skip-networking : NULL +# : Don't allow connection through TCP/IP. +# ----------------+----------------------------------------------------------- +# log-bin : string [name of the binlog files] +# : Log update queries in binary format. Optional (but +# : strongly recommended to avoid replication problems if +# : server's hostname changes) argument should be the chosen +# : location for the binary log files. +# ----------------+----------------------------------------------------------- +# Additionally the following variables are recognized: +# +# Be more verbose, accepts values from 1 to 4 +#DEBUG=4 +# +# The default location for the "master" pid file +#MYSQL_GLOB_PID_FILE="/var/run/svc-started-mysqld" +# +# The timeout for a failed attempt to stop a server +#STOPTIMEOUT=120 +# + +# The parameters are passed in a bash array variable, +# the variable name is mysql_slot_0_[server-num] +# "server-num" is an optional number used to start multiple servers +# +# Examples: +# +# start a default server with default options: +#mysql_slot_0=() +# +# start MySQL reniced, overriding some start parameters +#mysql_slot_0=( +# "nice=-5" +# "server-id=123" +# "log-bin="myhost" +# "port=3307" +#) +# +# start another server, different my.cnf +#mysql_slot_0_1=( +# "mycnf=/home/test/my.cnf" +# "server-id=124" +#) +# diff --git a/sys-apps/mysql/files/mysql.init b/sys-apps/mysql/files/mysql.init new file mode 100644 index 000000000000..2bbfde00ddac --- /dev/null +++ b/sys-apps/mysql/files/mysql.init @@ -0,0 +1,37 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/files/mysql.init,v 1.1 2007/01/02 10:21:12 vivo Exp $ + +depend() { + need net + use dns +} + +checkconfig() { + if [ ! -f /etc/mysql/my.cnf ] ; then + eerror "No /etc/mysql/my.cnf file exists!" + fi + + dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"` + + if [ ! -d $dir/mysql ] ; then + eerror "You dont appear to have the mysql database installed yet." + eerror "Please run /usr/bin/mysql_install_db to have this done..." + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting mysqld" + /usr/bin/safe_mysqld >/dev/null 2>&1 & + eend $? +} + +stop () { + ebegin "Stopping mysqld" + start-stop-daemon --stop --quiet \ + --pidfile=/var/run/mysqld/mysqld.pid --retry 20 + eend $? +} diff --git a/sys-apps/mysql/files/mysql.rc6 b/sys-apps/mysql/files/mysql.rc6 new file mode 100644 index 000000000000..4150a1c528f1 --- /dev/null +++ b/sys-apps/mysql/files/mysql.rc6 @@ -0,0 +1,357 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/files/mysql.rc6,v 1.1 2007/01/02 10:21:12 vivo Exp $ + +# external binaries used: which, sed, tac + +# int in_list(char * elem, char * list) +function in_list() { + local elem=${1:-"none"} + local list=${2:-","} + + [[ "${list}" == "${list/,${elem},/}" ]] \ + && return 1 \ + || return 0 +} + +function wdebug() { + if [[ "${DEBUG}" -ge "${1}" ]] ; then + shift + echo "dbg: ${@}" + fi +} + +depend() { + use dns net localmount netmount nfsmount +} + +do_escape() { + # Ihatethisreallyverymuch + #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|" + echo "$1" +} + +# int get_slot_config(srv_slot=0, srv_num) +get_slot_config() { + wdebug 4 ">>> get_slot_config()" + + local srv srv_slot srv_num + srv_slot="${1:-"0"}" + srv_num="${2}" + MY_SUFFIX="-${srv_slot}" + # srv=array(0 => [srv_slot], 1 => [srv_num] ) + srv=( ${srv_slot} ${srv_num} ) + + local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" + local conf_d_parameters="${!tmp_eval}" + if [[ "${srv_slot}" == "0" ]] ; then + MY_SUFFIX='' + # try some other default for the default server + [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=${mysql_slot[@]} + fi + [[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=( ) + basedir="" datadir="" pidfile="" socket="" + CHROOT="" NICE="" STARTUPTIMEOUT=5 STOPTIMEOUT=120 + + wdebug 3 "srv ${srv[@]}" + wdebug 3 "srv_slot ${srv_slot}" + wdebug 3 "srv_num ${srv_num}" + wdebug 3 "tmp_eval ${tmp_eval}" + wdebug 3 "conf_d_parameters ${conf_d_parameters[@]}" + wdebug 3 "MY_SUFFIX ${MY_SUFFIX}" + + local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" + local conf_d_parameters="${!tmp_eval}" + # collations need to be defined *after* the character sets, + # so we will duplicate them + local collations="" + [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters='' + + MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf" + # summa of unmanaged parameters + # some parameters may be present multiple times + unmanagedparams="" + + # grab the parameters from conf.d/mysql definition + for my_default in ${conf_d_parameters[*]} ; do + case "${my_default}" in + nice=*) + NICE="${my_default#nice=}" + nice -n $NICE ls /tmp &>/dev/null || NICE="" + ;; + mycnf=*) MY_CNF="${my_default#mycnf=}" ;; + startup_timeout=*) + STARTUPTIMEOUT="${my_default#startup_timeout=}" ;; + basedir=*) basedir="${my_default#basedir=}" ;; + datadir=*) datadir="${my_default#datadir=}" ;; + pid-file=*) pidfile="${my_default#pid-file=}" ;; + socket=*) socket="${my_default#socket=}" ;; + *collation*=) + collations="${collations} --$( do_escape "${my_default}" )" + ;; + *=*) + # list of parameters we already have + # prepend "--" because my_print_defaults do it + unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )" + ;; + *) + unmanagedparams="${unmanagedparams} --${my_default}" + ;; + esac + done + + if [[ ! -r "${MY_CNF}" ]] ; then + ewarn "Cannot access ${MY_CNF} !" + MY_CNF="" + my_defaults="" + else + local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)" + if [[ ! -x "${my_print_defaults}" ]] ; then + eerror "my_print_defaults NOT found or not executable" + my_defaults="" + else + my_defaults=$( ${my_print_defaults} \ + --loose-verbose \ + --config-file="${MY_CNF}" \ + mysqld server ) + fi + fi + + # grab needed parameters from my.cnf, don't override the ones from + # conf.d/mysql + for my_default in ${my_defaults} ; do + case "${my_default}" in + --basedir=*) + [[ -z "${basedir}" ]] && basedir="${my_default#--basedir=}" ;; + --datadir=*) + [[ -z "${datadir}" ]] && datadir="${my_default#--datadir=}" ;; + --pid-file=*) + [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;; + --socket=*) + [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;; + --*collation*=) + # the order is inversed because we want the conf.d ones overriden + collations="$( do_escape "${my_default}" ) ${collations}" + ;; + esac + done + + # some parameters + basedir="${basedir:-"/usr"}" + datadir="${datadir:-"/var/lib/mysql${MY_SUFFIX}"}" + pidfile="${pidfile:-"/var/run/mysqld/mysqld${MY_SUFFIX}.pid"}" + socket="${socket:-"/var/run/mysqld/mysqld${MY_SUFFIX}.sock"}" + unmanagedparams="${unmanagedparams} ${collations}" + + wdebug 3 "chroot dir => ${CHROOT}" + wdebug 3 "niceness => ${NICE}" + wdebug 3 "basedir => ${basedir}" + wdebug 3 "datadir => ${datadir}" + wdebug 3 "pidfile => ${pidfile}" + wdebug 3 "socket => ${socket}" + wdebug 3 "Unamanged => ${unmanagedparams}" + + # extension for sleep tenth of seconds, not very portable so check it before + if sleep 0.01 ; then + STARTUPTIMEOUT=$(( STARTUPTIMEOUT * 10 )) + STOPTIMEOUT=$(( STOPTIMEOUT * 10 )) + TIMEUNIT=0.1 + else + TIMEUNIT=1 + fi + + # push these out to the script + export MY_SUFFIX NICE MY_CNF pidfile datadir basedir socket CHROOT + export unmanagedparams STARTUPTIMEOUT STOPTIMEOUT TIMEUNIT + wdebug 4 "<<< get_slot_config() ok" + return 0 +} + +checkconfig() { + wdebug 4 ">>> checkconfig(\"${1}\")" + local datadir="${1}" pidfile="${2}" socket="${3}" + + if [[ -n "${NOCHECK}" ]] ; then + rm -f "${pidfile}" "${socket}" + return 0 + fi + + if [[ ! -d "${datadir}" ]] ; then + eerror "MySQL datadir is empty or invalid" + eerror "Please check your my.cnf : ${MY_CNF}" + wdebug 4 "<<< checkconfig() KO" + return 1 + fi + + if [[ ! -d "${datadir}/mysql" ]] ; then + eerror "You don't appear to have the mysql database installed yet." + eerror "Please run /usr/bin/mysql_install_db to have this done..." + wdebug 4 "<<< checkconfig() KO" + return 1 + fi + + if [[ -f "${pidfile}" ]] ; then + kill -15 $(< ${pidfile}) 2>/dev/null + if [[ $? -eq 0 ]] ; then + # the process exist, we have a problem + eerror "\"${pidfile}\" is still present and the process is running." + eerror "Please stop it \"kill $(< ${pidfile})\" maybe ?" + wdebug 4 "<<< checkconfig() KO" + return 1 + else + rm -f "${pidfile}" + fi + fi + + if [[ -S "${socket}" ]] ; then + ewarn "Strange, the socket file already exist in \"${socket}\"" + ewarn "it will be removed now and re-created by the MySQL server" + ewarn "BUT please make your checks." + rm -f "${socket}" + fi + + wdebug 4 "<<< checkconfig() ok" + return 0 +} + +start() { + wdebug 4 ">>> start()" + + MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"} + # servers are defined in /etc/conf.d/mysql + local serverlist=${!mysql_slot_*} + # provide default for empty conf.d/mysql + if [[ -z "${serverlist}" ]] ; then + serverlist=0 + export mysql_slot_0=( ) + fi + local retstatus timeout + local globretstatus=1 + local srv_slot srv_num + # server MUST NOT share same location for these + local pidfilelist=',' datadirlist=',' socketlist=',' + local ssd_thing=1 + local mysqld_thing tmpnice + + ebegin "Starting ${myservice}" + # try to start each server + for srv in ${serverlist[*]} ; do + + srv_slot="${srv#mysql_slot_}" + if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then + srv_num='' + else + srv_num="${srv_slot#*_}" + fi + srv_slot="${srv_slot%%_*}" + + retstatus=0 + get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1 + + # checks + if ! checkconfig "${datadir}" "${pidfile}" "${socket}" ; then + retstatus=2 ; continue + fi + if in_list "${pidfile}" "${pidfilelist}" ; then + eerror "Sorry, won't start with same pid-file: ${pidfile}" + retstatus=3 ; continue + fi + if in_list "${datadir}" "${datadirlist}" ; then + eerror "Sorry, won't start with same datadir: ${datadir}" + retstatus=4 ; continue + fi + if in_list "${socket}" "${socketlist}" ; then + eerror "Sorry, won't start with same socket: ${socket}" + retstatus=5 ; continue + fi + + einfo "Starting ${myservice} (${MY_CNF})" + + mysqld_thing="${MY_CNF:+"--defaults-file="}${MY_CNF}" + mysqld_thing="${mysqld_thing} ${unmanagedparams}" + mysqld_thing="${mysqld_thing} --basedir=${basedir}" + mysqld_thing="${mysqld_thing} --datadir=${datadir}" + mysqld_thing="${mysqld_thing} --pid-file=${pidfile}" + mysqld_thing="${mysqld_thing} --socket=${socket}" + + wdebug 2 "starting mysqld with: ${mysqld_thing}" + + if [[ ${ssd_thing} -eq 1 ]] ; then + tmpnice="${NICE:+"--nicelevel "}${NICE}" + start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \ + --background ${tmpnice} --pidfile ${pidfile} \ + --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing} + retstatus=$? + else + tmpnice="${NICE:+"nice -n "}${NICE}" + ${tmpnice} ${basedir}/sbin/mysqld${MY_SUFFIX} ${mysqld_thing} & + retstatus=0 + fi + + # only the first run is done by start-stop-daemon + ssd_thing="" + + # wait for socket creation + wdebug 1 + while ! [[ -S "${socket}" || "${STARTUPTIMEOUT}" -lt 1 || "${retstatus}" -ne 0 ]] ; do + STARTUPTIMEOUT=$(( STARTUPTIMEOUT - 1 )) + [[ ${DEBUG} -ge 1 ]] && echo -n "${STARTUPTIMEOUT}," + sleep ${TIMEUNIT} + done + wdebug 1 "" + if [[ ! -S "${socket}" ]] ; then + eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})" + retstatus=1 + else + globretstatus=0 + pidfilelist="${pidfilelist}${pidfile}," + datadirlist="${datadirlist}${datadir}," + socketlist="${socketlist}${socket}," + echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}" + fi + done + # successfull if at least one mysqld started + wdebug 4 "<<< start()" + eend $globretstatus +} + +stop() { + get_slot_config &> /dev/null + MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME/mysql/mysqld}"} + local runwhat pidfile shutdown_elem + local PID cnt timeout=${STOPTIMEOUT:-"120"} + local retstatus=0 + local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" + + ebegin "Stopping ${myservice}" + wdebug 5 "MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}" + wdebug 5 "shutdown_list: ${shutdown_list}" + for shutdown_elem in ${shutdown_list} ; do + runwhat=${shutdown_elem%%=*} + pidfile=${shutdown_elem#*=} + timeout=${STOPTIMEOUT:-"120"} + PID=$(< "${pidfile}" ) + wdebug 3 "runwhat ${runwhat}" + wdebug 3 "pidfile ${pidfile}" + wdebug 3 "timeout ${timeout}" + wdebug 3 "PID ${PID}" + + einfo "Stopping mysqld (${runwhat})" + + start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --stop --pidfile "${pidfile}" & + wdebug 1 "" + while [[ -n "$PID" ]] \ + && $( ps -Ao pid | grep -q "^ *$PID$" ) \ + && [[ "${timeout}" -ge 1 ]] + do + timeout=$(($timeout - 1)) + [[ ${DEBUG} -ge 1 ]] && echo -n "$(( $STOPTIMEOUT - $timeout ))," + sleep ${TIMEUNIT} + done + [[ "${timeout}" -lt 1 ]] && retstatus=1 + done + sleep ${TIMEUNIT} + [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE" + eend ${retstatus} +} diff --git a/sys-apps/mysql/files/mysqlmanager.conf.d b/sys-apps/mysql/files/mysqlmanager.conf.d new file mode 100644 index 000000000000..8666f71596cc --- /dev/null +++ b/sys-apps/mysql/files/mysqlmanager.conf.d @@ -0,0 +1,28 @@ +# Here is where we define which server(s) to start. +# Additional parameters to be passed to mysqlmanager at startup may be added here, +# which will override the ones in "my.cnf". +# +# To avoid starting a server just comment it's definition +# here or it will rant (no default start). +# Last but not least, spaces are NOT allowed inside the parameters! +# +# Below are described some suggested parameters to use. +# The parameters not recognized will be passed through to the mysqlmanager directly. +# +# Parameter : description + +# ----------------+----------------------------------------------------------- +# mycnf : string [full path to my.cnf] +# : specify the path to my.cnf file to be used +# : may contain a [manager] section +# ----------------+----------------------------------------------------------- +# +# Basic default +# +#mysqlmanager_slot_0=() +# +# Start MySQL 5.0.X overriding the my.cnf path +#mysqlmanager_slot_500=( +# "mycnf=/home/test/my.cnf" +#) +# diff --git a/sys-apps/mysql/files/mysqlmanager.rc6 b/sys-apps/mysql/files/mysqlmanager.rc6 new file mode 100644 index 000000000000..3363b55b3c82 --- /dev/null +++ b/sys-apps/mysql/files/mysqlmanager.rc6 @@ -0,0 +1,230 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/files/mysqlmanager.rc6,v 1.1 2007/01/02 10:21:12 vivo Exp $ + +# external binaries used: which, sed, tac + +depend() { + use dns net localmount netmount nfsmount + #provide mysql +} + +# int in_list(char * elem, char * list) +function in_list() { + local elem=${1:-"none"} + local list=${2:-","} + + [[ "${list}" == "${list/,${elem},/}" ]] \ + && return 1 \ + || return 0 +} + +do_escape() { + # Ihatethisreallyverymuch + #echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|" + echo "$1" +} + +# int get_slot_config(srv_slot=0, srv_num) +get_slot_config() { + [[ ${DEBUG} -ge 4 ]] && einfo ">>> get_slot_config(\"${1}\", \"${2}\")" + + srv_slot="${1:-"0"}" + srv_num="${2}" + MY_SUFFIX="-${srv_slot}" + [[ "${MY_SUFFIX}" == '-0' ]] && MY_SUFFIX='' + + basedir="" pidfile="" socket="" + + local tmp_eval="mysqlmanager_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]" + local conf_d_parameters="${!tmp_eval}" + [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters='' + + MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf" + # summa of unmanaged parameters + # some parameters may be present multiple times + unmanagedparams="" + + # grab the parameters from conf.d/mysql definition + for my_default in ${conf_d_parameters[*]} ; do + case "${my_default}" in + mycnf=*) MY_CNF="${my_default#mycnf=}" ;; + basedir=*) basedir="${my_default#basedir=}" ;; + pid-file=*) pidfile="${my_default#pid-file=}" ;; + socket=*) socket="${my_default#socket=}" ;; + *=*) + # list of parameters we already have + # prepend "--" because my_print_defaults do it + unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )" + ;; + *) + unmanagedparams="${unmanagedparams} --${my_default}" + ;; + esac + done + + if [[ ! -r "${MY_CNF}" ]] ; then + ewarn "Cannot access ${MY_CNF} !" + MY_CNF="" + my_defaults="" + else + local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)" + if [[ ! -x "${my_print_defaults}" ]] ; then + eerror "my_print_defaults NOT found or not executable" + my_defaults="" + else + my_defaults=$( ${my_print_defaults} \ + --loose-verbose \ + --config-file="${MY_CNF}" \ + manager ) + fi + fi + + # grab needed parameters from my.cnf, don't override the ones from + # conf.d/mysql + for my_default in ${my_defaults} ; do + case "${my_default}" in + --pid-file=*) + [[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;; + --socket=*) + [[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;; + esac + done + + # still empty, I'm in doubt if assign a default or break, will see + basedir="${basedir:-"/usr"}" + pidfile="${pidfile:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.pid"}" + socket="${socket:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.sock"}" + + if [[ ${DEBUG} -ge 3 ]] ; then + einfo "basedir => ${basedir}" + einfo "pidfile => ${pidfile}" + einfo "socket => ${socket}" + einfo "Unamanged => ${unmanagedparams}" + fi + + # push these out to the script + export MY_SUFFIX MY_CNF pidfile basedir socket + export unmanagedparams + [[ ${DEBUG} -ge 4 ]] && einfo "<<< get_slot_config() ok" + return 0 +} + +start() { + [[ ${DEBUG} -ge 4 ]] && einfo ">>> start()" + MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"} + # servers are defined in /etc/conf.d/mysql + local serverlist=${!mysqlmanager_slot_*} + # provide default for empty conf.d/mysql + if [[ -z "${serverlist}" ]] ; then + serverlist=0 + export mysqlmanager_slot_0=() + fi + local retstatus timeout + local globretstatus=1 + local srv_slot srv_num + # server MUST NOT share same location for these + local pidfilelist=',' socketlist=',' + + # additional security + rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}" + if [[ $? -ne 0 ]] ; then + eerror "cannot create MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}" + [[ ${DEBUG} -ge 4 ]] && einfo "<<< start() KO" + return 1 + fi + + ebegin + # try to start each server + for srv in ${serverlist[*]} ; do + einfo "working on ${srv}" + + srv_slot="${srv#mysqlmanager_slot_}" + if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then + srv_num='' + else + srv_num="${srv_slot#*_}" + fi + srv_slot="${srv_slot%%_*}" + + retstatus=0 + get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1 + + # timeout (seconds) before declaring the startup failed + + # pre_run checks + if [[ "$retstatus" -eq 0 ]] ; then + if in_list "${pidfile}" "${pidfilelist}" ; then + retstatus=3 + eerror "Sorry, won't start with same pid-file: ${pidfile}" + fi + if in_list "${socket}" "${socketlist}" ; then + retstatus=5 + eerror "Sorry, won't start with same socket: ${socket}" + fi + fi + + if [[ $retstatus -eq 0 ]] ; then + # additional security + rm -f ${pidfile} ${socket} + einfo "Starting mysqlmanager${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})" + + [[ ${DEBUG} -ge 2 ]] && echo "starting mysqlmanager with: "${basedir}/sbin/mysqlmanager${MY_SUFFIX} ${unmanagedparams} --pid-file=${pidfile} --socket=${socket} + + start-stop-daemon --quiet --start --background \ + --pidfile "${pidfile}" \ + --exec ${basedir}/sbin/mysqlmanager${MY_SUFFIX} \ + -- \ + ${MY_CNF:+"--defaults-file="}${MY_CNF} \ + ${unmanagedparams} \ + --pid-file=${pidfile} \ + --socket=${socket} + + retstatus=$? + + if [[ "${retstatus}" -eq 0 ]] ; then + pidfilelist="${pidfilelist}${pidfile}," + socketlist="${socketlist}${socket}," + globretstatus=0 + echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}" + fi + fi + done + # successfull if at least one mysqlmanager started + [[ ${DEBUG} -ge 4 ]] && einfo "<<< start()" + eend $globretstatus +} + +stop () { + MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-${SVCNAME}"} + local runwhat pidfile shutdown_elem + local PID cnt timeout + local retstatus=0 + local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )" + + # shutdown in reverse order + ebegin + for shutdown_elem in $shutdown_list; do + runwhat=${shutdown_elem%%=*} + pidfile=${shutdown_elem#*=} + timeout=${STOPTIMEOUT:-"10"} + + einfo "Stopping mysqlmanager (${runwhat})" + + PID=$(cat "${pidfile}" 2>/dev/null) + start-stop-daemon --stop --quiet --pidfile="${pidfile}" + [[ ${DEBUG} -ge 1 ]] && echo "" + while [[ -n "$PID" && $( kill -0 $PID 2>/dev/null ) && "${timeout}" -ge 1 ]] ; do + timeout=$(($timeout - 1)) + [[ ${DEBUG} -ge 1 ]] && echo -n $(( $STOPTIMEOUT - $timeout )) + sleep 1 + done + if [[ "${timeout}" -lt 1 ]] ; then + retstatus=$(( $retstatus + 1 )) + fi + done + + [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE" + eend $retstatus +} diff --git a/sys-apps/mysql/mysql-1.ebuild b/sys-apps/mysql/mysql-1.ebuild new file mode 100644 index 000000000000..66ebd19489c4 --- /dev/null +++ b/sys-apps/mysql/mysql-1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mysql/mysql-1.ebuild,v 1.1 2007/01/02 10:21:12 vivo Exp $ + +DESCRIPTION="Install gentoo related MySQL stuff" +HOMEPAGE="http://www.gentoo.org" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_install() { + + insinto "/etc/conf.d" + newins "${FILESDIR}/mysql.conf.d" "mysql" + newins "${FILESDIR}/mysqlmanager.conf.d" "mysqlmanager" + + exeinto /etc/init.d + newexe "${FILESDIR}/mysql.rc6" "mysql" + newexe "${FILESDIR}/mysqlmanager.rc6" "mysqlmanager" + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate.mysql" "mysql" + +}