From 24504907a983f07cf4de2d1938e8fd3d884ee623 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9>
Date: Sat, 13 Sep 2008 13:28:19 +0000
Subject: backupninja: upgraded to 0.9.6

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@237 18ef50b8-d735-4ccd-97c1-689132df3dd9
---
 app/backup/backupninja/backupninja-0.9.5.diff | 113 ++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 app/backup/backupninja/backupninja-0.9.5.diff

(limited to 'app/backup/backupninja/backupninja-0.9.5.diff')

diff --git a/app/backup/backupninja/backupninja-0.9.5.diff b/app/backup/backupninja/backupninja-0.9.5.diff
new file mode 100644
index 0000000..a9e924a
--- /dev/null
+++ b/app/backup/backupninja/backupninja-0.9.5.diff
@@ -0,0 +1,113 @@
+diff -Naur backupninja-0.9.5.orig/handlers/mysql.in backupninja-0.9.5/handlers/mysql.in
+--- backupninja-0.9.5.orig/handlers/mysql.in	2007-11-19 23:28:49.000000000 -0200
++++ backupninja-0.9.5/handlers/mysql.in	2007-12-18 20:09:48.000000000 -0200
+@@ -91,8 +91,7 @@
+ then
+     if [ $usevserver = yes ]
+     then
+-    	vhome=`$VSERVER $vsname exec getent passwd "root" | @AWK@ -F: '{print $6}'`
+-	home="$vroot$vhome"
++    	home=`$VSERVER $vsname exec getent passwd "root" | @AWK@ -F: '{print $6}'`
+     else
+     	home=`getent passwd "root" | @AWK@ -F: '{print $6}'`
+     fi
+@@ -100,18 +99,25 @@
+     [ -d $home ] || fatal "Can't find root's home directory ($home)."
+     
+     mycnf="$home/.my.cnf"
+-    
+-    if [ -f $mycnf ]
++
++    if [ $usevserver = yes ]
++    then
++      workcnf="$vroot$mycnf"
++    else
++      workcnf="$mycnf"
++    fi
++
++    if [ -f $workcnf ]
+     then
+-	# rename temporarily
+-	tmpcnf="$home/my.cnf.disable"
+-	debug "mv $mycnf $tmpcnf"
+-	mv $mycnf $tmpcnf
++      # rename temporarily
++      tmpcnf="$workcnf.disable"
++      debug "mv $workcnf $tmpcnf"
++      mv $workcnf $tmpcnf
+     fi
+     
+     oldmask=`umask`
+     umask 077
+-    cat > $mycnf <<EOF
++    cat > $workcnf <<EOF
+ # auto generated backupninja mysql conf
+ [mysql]
+ host=$dbhost
+@@ -127,14 +133,14 @@
+ host=$dbhost
+ user=$dbusername
+ password="$dbpassword"
++
++[mysqladmin]
++host=$dbhost
++user=$dbusername
++password="$dbpassword"
+ EOF
+ 	umask $oldmask
+-	if [ $usevserver = yes ] 
+-	then
+-	    defaultsfile="--defaults-extra-file=$vhome/.my.cnf"
+-	else
+-	    defaultsfile="--defaults-extra-file=$mycnf"
+-	fi
++	defaultsfile="--defaults-extra-file=$mycnf"
+ fi
+ 
+ # if a user is not set, use $configfile, otherwise use $mycnf
+@@ -145,22 +151,23 @@
+ 	userset=true;
+ 	if [ $usevserver = yes ]
+ 	then
+-	    vuserhome=`$VSERVER $vsname exec getent passwd "$user" | @AWK@ -F: '{print $6}'`
++	    userhome=`$VSERVER $vsname exec getent passwd "$user" | @AWK@ -F: '{print $6}'`
+ 	    if [ $? -eq 2 ]
+ 	    then
+ 	    	fatal "User $user not found in /etc/passwd"
+ 	    fi
+-    	    userhome="$vroot$vuserhome"
++	    debug "User home set to: $vroot$userhome"
++	    [ -f $vroot$userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
+ 	else
+ 	    userhome=`getent passwd "$user" | @AWK@ -F: '{print $6}'`
+ 	    if [ $? -eq 2 ]
+ 	    then
+ 	    	fatal "User $user not found in /etc/passwd"
+ 	    fi
+-       	fi
++	    debug "User home set to: $userhome"
++	    [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
++	fi
+ 	
+-	debug "User home set to: $userhome"
+-	[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
+ 	defaultsfile="--defaults-extra-file=$userhome/.my.cnf"
+ 	debug "using $defaultsfile"
+ fi
+@@ -310,12 +317,12 @@
+ if [ "$dbusername" != "" -a "$dbpassword" != "" ]
+ then
+ 	## clean up tmp config file
+-	debug "rm $mycnf"
+-	rm $mycnf
++	debug "rm $workcnf"
++	rm $workcnf
+ 	if [ -f "$tmpcnf" ]
+ 	then
+-		debug "mv $tmpcnf $mycnf"
+-		mv $tmpcnf $mycnf
++		debug "mv $tmpcnf $workcnf"
++		mv $tmpcnf $workcnf
+ 	fi
+ fi
+ 
-- 
cgit v1.2.3