X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=a4a1497d35195acce702b887d0a1b4c266d855ba;hb=1a2279cba4d6d3c8096d806d8042e228308465af;hp=b552ddebc346c7c5647e50d830c451e9d5a6f5dd;hpb=1e410a6d9574c56b7d3a3633b82220eacf782d06;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index b552dde..a4a1497 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -4,17 +4,30 @@
 
 getconf backupdir /var/backups/mysql
 getconf databases all
-getconf compress yes
-getconf dbusername
-getconf dbpassword
 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 [ "$user" == "" ]; then
+	userset=false;
+	user=root;
+else
+	userset=true;
+	userhome=`grep "^$user:" /etc/passwd | awk -F: '{print $6}'`
+	[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
+fi
+
 # If vservers are configured, decide if the handler should
 # use them or if it should just operate on the host
+
 if [ "$VSERVERS" = "yes" ]
 then
 	if [ ! -z $vsname ]
@@ -49,15 +62,28 @@ 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}'`
+defaultsfile=""
+if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
+	home=`grep '^root:' /etc/passwd | awk -F: '{print $6}'`
 	[ -d $home ] || fatal "Can't find root's home directory ($home)."
-	mycnf="$vroot$home/.my.cnf"
+	mycnf="$home/.my.cnf"
 	if [ -f $mycnf ]; then
 		# rename temporarily
 		tmpcnf="$home/my.cnf.disable"
@@ -70,19 +96,24 @@ if [ "$dbusername" != "" ]; then
 # auto generated backupninja mysql conf
 [mysql]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 
 [mysqldump]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 
 [mysqlhotcopy]
 user=$dbusername
-password=$dbpassword
+password="$dbpassword"
 EOF
 	umask $oldmask
+	defaultsfile="--defaults-file=$mycnf"
+elif [ "$userset" == "false" ]; then
+	# if user is set, don't use $configfile
+	defaultsfile="--defaults-file=$configfile"
 fi
-	
+
+#######################################################################
 ## HOT COPY
 
 if [ "$hotcopy" == "yes" ]; then 
@@ -128,25 +159,26 @@ if [ "$hotcopy" == "yes" ]; then
 		done
 	fi
 fi
-	
+
+##########################################################################
 ## SQL DUMP
 
 if [ "$sqldump" == "yes" ]; then
 	if [ "$databases" == "all" ]; then
 		if [ $usevserver ]
 		then
-			databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL" | grep -v Database`
+			databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 		else
-			databases=`echo 'show databases' | su $user -c "$MYSQL" | grep -v Database`
+			databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 		fi
 	fi
 
 	for db in $databases; do
 		if [ $usevserver ]
 		then
-			execstr="$VSERVER $vsname exec $MYSQLDUMP --lock-tables --complete-insert --add-drop-table --quick --quote-names $db > $vroot$dumpdir/${db}.sql"
+			execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $db > $vroot$dumpdir/${db}.sql"
 		else
-			execstr="$MYSQLDUMP --lock-tables --complete-insert --add-drop-table --quick --quote-names $db > $dumpdir/${db}.sql"
+			execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $db > $dumpdir/${db}.sql"
 		fi
 		debug "su $user -c '$execstr'"
 		if [ ! $test ]; then
@@ -168,6 +200,7 @@ if [ "$sqldump" == "yes" ]; then
 	fi
 fi
 
+# clean up tmp config file
 if [ "$dbusername" != "" ]; then
 	## clean up tmp config file
 	debug "rm $mycnf"