X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=49f80a8545816fedb760fe1d148745f5bc8526eb;hb=f46646600fb4f89235ab3cf1e096885f1ed59666;hp=b552ddebc346c7c5647e50d830c451e9d5a6f5dd;hpb=1e410a6d9574c56b7d3a3633b82220eacf782d06;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/mysql b/handlers/mysql index b552dde..49f80a8 100644 --- a/handlers/mysql +++ b/handlers/mysql @@ -4,18 +4,24 @@ getconf backupdir /var/backups/mysql getconf databases all -getconf compress yes -getconf dbusername -getconf dbpassword +getconf ignores getconf dbhost localhost getconf hotcopy no getconf sqldump no -getconf user root +getconf compress yes getconf vsname +# authentication: +getconf user +getconf dbusername +getconf dbpassword +getconf configfile /etc/mysql/debian.cnf + + # If vservers are configured, decide if the handler should # use them or if it should just operate on the host -if [ "$VSERVERS" = "yes" ] + +if [ "$vservers" = "yes" ] then if [ ! -z $vsname ] then @@ -26,14 +32,39 @@ then fi fi -# Check to make sure that the specified vserver exists +# If needed, make sure that the specified vserver exists and is running. if [ $usevserver ] then + info "Examining vserver '$vsname'" + # does it exist ? vroot="$VROOTDIR/$vsname" [ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'" + # is it running ? + $VSERVERINFO -q $vsname RUNNING + if [ $? -ne 0 ] + then + fatal "vserver $vsname is not running." + fi fi + +if [ "$user" == "" ]; then + userset=false; + user=root; +else + userset=true; + userhome=`getent passwd "$user" | awk -F: '{print $6}'` + [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf" +fi + +## Prepare ignore part of the command +## This only works for mysqldump at the moment + +ignore='' +for i in $ignores; do + ignore="$ignore --ignore-table=$i" +done -# create backup dirs, the vroot variable will be empty if no vsname was specified +# create backup dirs, vroot variable will be empty if no vsname was specified # and will proceed to operate on the host [ -d $vroot$backupdir ] || mkdir -p $vroot$backupdir [ -d $vroot$backupdir ] || fatal "Backup directory '$vroot$backupdir'" @@ -49,40 +80,65 @@ else [ "$hotcopy" == "no" -o -d $hotdir ] || mkdir -p $hotdir fi +####################################################################### +## AUTHENTICATION + +# +# one of three authentication methods: +# 1. setting the user, so that /home/user/.my.cnf is used. +# 2. specifying the user and password in the handler config, +# which generates a temporary .my.cnf in /root/.my.cnf +# 3. specify the config file with --defaults-file +# (this option DOESN'T WORK WITH MYSQLHOTCOPY) +# + # create .my.cnf -# (we do this because we don't want to have to specify the password on the command line -# because then anyone would be able to see it with a 'ps aux'. instead, we create a -# temporary ~/.my.cnf in root's home directory). +# only if dbusername and dbpassword specified. +# we create a tmp file because we don't want to +# specify the password on the command line. -if [ "$dbusername" != "" ]; then - home=`grep '^root:' $vroot/etc/passwd | awk -F: '{print $6}'` - [ -d $home ] || fatal "Can't find root's home directory ($home)." - mycnf="$vroot$home/.my.cnf" - if [ -f $mycnf ]; then - # rename temporarily - tmpcnf="$home/my.cnf.disable" - debug "mv $mycnf $tmpcnf" - mv $mycnf $tmpcnf - fi - oldmask=`umask` - umask 077 - cat > $mycnf < $mycnf <