X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=8283ba4a00ac86add0dcbcf42a4d7617f3d02222;hb=a56165ce12dbf68ee8522aa5bf0c40aa7928e399;hp=165ebc68829c35ec63a59154183c7d0e0b5b19e1;hpb=6bc45553f06e6c9b7c1162253bd0e28f3b07bbf2;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index 165ebc6..8283ba4 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -3,38 +3,65 @@
 #
 
 getconf backupdir /var/backups/mysql
+getconf configfile /etc/mysql/debian.cnf
 getconf databases all
 getconf compress yes
 getconf dbusername
 getconf dbpassword
 getconf dbhost localhost
-getconf hotcopy no
+getconf hotcopy yes
 getconf sqldump no
 getconf user root
+getconf vsname
 
-# create backup dirs
+# If vservers are configured, decide if the handler should
+# use them or if it should just operate on the host
 
-[ -d $backupdir ] || mkdir -p $backupdir
-[ -d $backupdir ] || fatal "Backup directory '$backupdir'"
+if [ "$VSERVERS" = "yes" ]
+then
+	if [ ! -z $vsname ]
+	then		
+		info "Using vserver '$vsname'"
+		usevserver=1
+	else
+		info "No vserver name specified, actions will be performed on the host"
+	fi
+fi
+
+# Check to make sure that the specified vserver exists
+if [ $usevserver ]
+then
+	vroot="$VROOTDIR/$vsname"
+	[ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
+fi
+	
+# create backup dirs, the 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'"
 hotdir="$backupdir/hotcopy"
 dumpdir="$backupdir/sqldump"
-[ "$sqldump" == "no" -o -d $dumpdir ] || mkdir -p $dumpdir
-[ "$hotcopy" == "no" -o -d $hotdir ] || mkdir -p $hotdir
+
+if [ $usevserver ]
+then
+	[ "$sqldump" == "no" -o -d $vroot$dumpdir ] || $VSERVER $vsname exec mkdir -p $dumpdir
+	[ "$hotcopy" == "no" -o -d $vroot$hotdir ] || $VSERVER $vsname exec mkdir -p $hotdir
+else
+	[ "$sqldump" == "no" -o -d $dumpdir ] || mkdir -p $dumpdir
+	[ "$hotcopy" == "no" -o -d $hotdir ] || mkdir -p $hotdir
+fi
 
 # 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 have to
+# specify the password on the command line.
 
-if [ "$dbusername" != "" ]; then
-	home=`grep '^root' /etc/passwd | awk -F: '{print $6}'`
-	[ -d $home ] || fatal "Can't find root's home directory ($home)."
-	mycnf="$home/.my.cnf"
+defaultsfile=""
+if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
+	mycnf="/tmp/backupninja.$$.my.cnf"
 	if [ -f $mycnf ]; then
-		# rename temporarily
-		tmpcnf="$home/my.cnf.disable"
-		debug "mv $mycnf $tmpcnf"
-		mv $mycnf $tmpcnf
+		debug "rm $mycnf"
+		rm $mycnf
 	fi
 	oldmask=`umask`
 	umask 077
@@ -53,13 +80,22 @@ user=$dbusername
 password=$dbpassword
 EOF
 	umask $oldmask
+	defaultsfile="--defaults-file $mycnf"
+else
+	# otherwise, use $configfile
+	defaultsfile="--defaults-file $configfile"
 fi
-	
+
 ## HOT COPY
 
 if [ "$hotcopy" == "yes" ]; then 
 	if [ "$databases" == "all" ]; then
-		execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
+		if [ $usevserver ]
+		then
+			execstr="$VSERVER $vsname exec $MYSQLHOTCOPY $defaultsfile --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
+		else
+			execstr="$MYSQLHOTCOPY $defaultsfile --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
+		fi
 		debug "su $user -c '$execstr'"
 		if [ ! $test ]; then
 			output=`su $user -c "$execstr" 2>&1`
@@ -74,7 +110,12 @@ if [ "$hotcopy" == "yes" ]; then
 		fi
 	else	
 		for db in $databases; do
-			execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
+			if [ $usevserver ]
+			then
+				execstr="$VSERVER $vsname exec $MYSQLHOTCOPY $defaultsfile --allowold $db $hotdir"
+			else
+				execstr="$MYSQLHOTCOPY $defaultsfile --allowold $db $hotdir"
+			fi
 			debug "su $user -c '$execstr'"
 			if [ ! $test ]; then
 				output=`su $user -c "$execstr" 2>&1`
@@ -95,11 +136,21 @@ fi
 
 if [ "$sqldump" == "yes" ]; then
 	if [ "$databases" == "all" ]; then
-		databases=`echo 'show databases' | su $user -c "$MYSQL" | grep -v Database`
+		if [ $usevserver ]
+		then
+			databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
+		else
+			databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
+		fi
 	fi
 
 	for db in $databases; do
-		execstr="$MYSQLDUMP --lock-tables --complete-insert --add-drop-table --quick --quote-names $db > $dumpdir/${db}.sql"
+		if [ $usevserver ]
+		then
+			execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $db > $vroot$dumpdir/${db}.sql"
+		else
+			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
 			output=`su $user -c "$execstr" 2>&1`
@@ -115,19 +166,15 @@ if [ "$sqldump" == "yes" ]; then
 	done
 	
 	if [ "$compress" == "yes" ]; then
-		output=`$GZIP -f $dumpdir/*.sql 2>&1`
+		output=`$GZIP -f $vroot$dumpdir/*.sql 2>&1`
 		debug $output
 	fi
 fi
 
-if [ "$dbusername" != "" ]; then
-	## clean up tmp config file
+# clean up tmp config file
+if [ -f "$mycnf" ]; then
 	debug "rm $mycnf"
 	rm $mycnf
-	if [ -f "$tmpcnf" ]; then
-		debug "mv $tmpcnf $mycnf"
-		mv $tmpcnf $mycnf
-	fi
 fi
 
 return 0