diff options
| author | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2006-11-02 19:32:29 +0000 |
|---|---|---|
| committer | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2006-11-02 19:32:29 +0000 |
| commit | eba69785443cd694512ab1b9c0d64d227af0a14f (patch) | |
| tree | a417276dbea823a95254909a5aa78fa23e06a2a7 /backupninja | |
| parent | 462371a0b40b76bf9394c78c80f3ac4288286e3c (diff) | |
| download | slackbuilds-eba69785443cd694512ab1b9c0d64d227af0a14f.tar.gz slackbuilds-eba69785443cd694512ab1b9c0d64d227af0a14f.tar.bz2 | |
backupninja: added patch for 0.9.4 fixing pgsql handler
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@568 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'backupninja')
| -rw-r--r-- | backupninja/backupninja-0.9.4.diff | 67 | ||||
| -rwxr-xr-x | backupninja/backupninja.SlackBuild | 2 |
2 files changed, 68 insertions, 1 deletions
diff --git a/backupninja/backupninja-0.9.4.diff b/backupninja/backupninja-0.9.4.diff new file mode 100644 index 00000000..0e64bbbd --- /dev/null +++ b/backupninja/backupninja-0.9.4.diff @@ -0,0 +1,67 @@ +diff -Naur backupninja-0.9.4.orig/handlers/pgsql backupninja-0.9.4/handlers/pgsql +--- backupninja-0.9.4.orig/handlers/pgsql 2006-10-07 01:45:20.000000000 -0300 ++++ backupninja-0.9.4/handlers/pgsql 2006-11-02 17:28:25.000000000 -0200 +@@ -7,6 +7,7 @@ + getconf databases all + getconf compress yes + getconf vsname ++getconf pgsqluser postgres + + localhost=`hostname` + +@@ -62,12 +63,12 @@ + # give backup dir the good uid and permissions + # (in respect to the vserver, if $usevserver = yes) + if [ $usevserver = yes ]; then +- pguid=`$VSERVER $vsname exec getent passwd $PGSQLUSER | awk -F: '{print $3}'` ++ pguid=`$VSERVER $vsname exec getent passwd $pgsqluser | awk -F: '{print $3}'` + else +- pguid=`getent passwd postgres | awk -F: '{print $3}'` ++ pguid=`getent passwd $pgsqluser | awk -F: '{print $3}'` + fi + [ -n "$pguid" ] || \ +- fatal "No user called postgres`[ $usevserver = no ] || echo \" on vserver $vsname\"`." ++ fatal "No user called $pgsqluser`[ $usevserver = no ] || echo \" on vserver $vsname\"`." + debug "chown $pguid $vroot$backupdir" + chown $pguid $vroot$backupdir + debug "chmod 700 $vroot$backupdir" +@@ -77,15 +78,15 @@ + if [ "$databases" == "all" ]; then + if [ $usevserver = yes ]; then + if [ "$compress" == "yes" ]; then +- execstr="$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${vsname}.sql.gz\"" ++ execstr="$VSERVER $vsname exec su - $pgsqluser -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${vsname}.sql.gz\"" + else +- execstr="$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMPALL > $backupdir/${vsname}.sql\"" ++ execstr="$VSERVER $vsname exec su - $pgsqluser -c \"$PGSQLDUMPALL > $backupdir/${vsname}.sql\"" + fi + else + if [ "$compress" == "yes" ]; then +- execstr="su - postgres -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${localhost}-all.sql.gz\"" ++ execstr="su - $pgsqluser -c \"$PGSQLDUMPALL | $GZIP > $backupdir/${localhost}-all.sql.gz\"" + else +- execstr="su - postgres -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\"" ++ execstr="su - $pgsqluser -c \"$PGSQLDUMPALL > $backupdir/${localhost}-all.sql\"" + fi + fi + debug "$execstr" +@@ -106,15 +107,15 @@ + for db in $databases; do + if [ $usevserver = yes ]; then + if [ "$compress" == "yes" ]; then +- execstr="$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\"" ++ execstr="$VSERVER $vsname exec su - $pgsqluser -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\"" + else +- execstr="$VSERVER $vsname exec su - postgres -c \"$PGSQLDUMP $db | > $backupdir/${db}.sql\"" ++ execstr="$VSERVER $vsname exec su - $pgsqluser -c \"$PGSQLDUMP $db | > $backupdir/${db}.sql\"" + fi + else + if [ "$compress" == "yes" ]; then +- execstr="su - postgres -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\"" ++ execstr="su - $pgsqluser -c \"$PGSQLDUMP $db | $GZIP > $backupdir/${db}.sql.gz\"" + else +- execstr="su - postgres -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\"" ++ execstr="su - $pgsqluser -c \"$PGSQLDUMP $db > $backupdir/${db}.sql\"" + fi + fi + debug "$execstr" diff --git a/backupninja/backupninja.SlackBuild b/backupninja/backupninja.SlackBuild index bfdccf16..dd7436c7 100755 --- a/backupninja/backupninja.SlackBuild +++ b/backupninja/backupninja.SlackBuild @@ -18,7 +18,7 @@ fi PACKAGE="backupninja" ARCH="noarch" VERSION=${VERSION:=0.9.4} -BUILD=${BUILD:=2rha} +BUILD=${BUILD:=3rha} SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} REPOS=${REPOS:=$TMP} |