[backup.sh] Fixing binary paths.

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/shtrom/scripts@1964 1991c358-8f32-0410-a49a-990740bdf4c2

1 files changed, 7 insertions, 5 deletions

diff --git a/openbsd/backup.sh b/openbsd/backup.sh
index 0f147ba..f3b609b 100755
--- a/openbsd/backup.sh
+++ b/openbsd/backup.sh
@@ -7,8 +7,10 @@ BACKUPSERVER=backup.narf.ssji.net
 #REMOTEBACKUPDIR="`hostname -s`@${BACKUPSERVER}::${BACKUPDIR}"
 REMOTEBACKUPDIR="`hostname -s`@${BACKUPSERVER}::/share/homes/`hostname -s`"
 EXCLUDEALWAYS="${BACKUPROOT} /srv/backup/ /srv/www/sites/offlines.fr/"
+MYSQLBINPATH=/usr/local/bin/
 MYSQLDUMPDIR="/srv/dbdumps/"
 MYSQLUSER="dumper"
+LDAPBINPATH=/usr/local/bin/
 LDAPDUMPDIR="/srv/dbdumps/"
 LDAPUSER="cn=root,dc=example,dc=net"
 TMPSUBDIR=/tmp
@@ -17,10 +19,10 @@ TMPSUBDIR=/tmp
 # [0] http://serverfault.com/questions/8860/how-can-i-export-the-privileges-from-mysql-and-then-import-to-a-new-server/13050#13050
 mysqldump-grants()
 {
-	mysql -B -N $@ -e "SELECT DISTINCT CONCAT(
+	${MYSQLBINPATH}mysql -B -N $@ -e "SELECT DISTINCT CONCAT(
 		'SHOW GRANTS FOR \'', user, '\'@\'', host, '\';'
 		) AS query FROM mysql.user" | \
-		mysql $@ | \
+		${MYSQLBINPATH}mysql $@ | \
 		sed 's/\(GRANT .*\)/\1;/;s/^\(Grants for .*\)/## \1 ##/;/##/{x;p;x;}'
 }
 
@@ -37,14 +39,14 @@ if [ ! -z "$MYSQLDUMPDIR" ]; then
 	MYSQLDUMP="${MYSQLDUMPDIR}mysql.dump.sql"
 	echo -n " mysql (${MYSQLDUMP})"
 	# GRANT SELECT, SHOW VIEW, TRIGGER, LOCK TABLES ON *.* TO 'dumper'@'localhost';
-	mysqldump --comments --dump-date -u ${MYSQLUSER} -A --events --ignore-table=mysql.event > ${MYSQLDUMP} 
+	${MYSQLBINPATH}mysqldump --comments --dump-date -u ${MYSQLUSER} > ${MYSQLDUMP} 
 	mysqldump-grants -u ${MYSQLUSER} >> ${MYSQLDUMP}
 fi
 
 if [ ! -z "$LDAPDUMPDIR" ]; then
-	LDAPDUMP="${LDAPDUMPDIR}ldap.dump.sql"
+	LDAPDUMP="${LDAPDUMPDIR}ldap.dump.ldiff"
 	echo -n " ldap (${LDAPDUMP}) NOT"
-	# ldapvi --out --host localhost -D ${LDAPUSER} > ${LDAPDUMP}
+	#${LDAPBINPATH}ldapvi --out --host localhost -D ${LDAPUSER} > ${LDAPDUMP}
 fi
 echo "."