aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-11-26 12:30:35 -0500
committerMicah Anderson <micah@riseup.net>2012-11-26 12:30:40 -0500
commit4c7660f2013c6a9347085fa56bc2d81cdafd36c9 (patch)
treef868abe5bd34be9fd6b19ab968b07d0466f3572f
parent9b679b71a81dac2ca1ba3cbaebb067e9ee6b3946 (diff)
downloadbackupninja-4c7660f2013c6a9347085fa56bc2d81cdafd36c9.tar.gz
backupninja-4c7660f2013c6a9347085fa56bc2d81cdafd36c9.tar.bz2
set autotools markers and default application paths
-rw-r--r--handlers/dsync.in3
-rwxr-xr-xsrc/backupninja.in2
2 files changed, 4 insertions, 1 deletions
diff --git a/handlers/dsync.in b/handlers/dsync.in
index 6752dad..d63b3be 100644
--- a/handlers/dsync.in
+++ b/handlers/dsync.in
@@ -169,6 +169,7 @@ function do_rotate() {
echo "Debug: skipping rotate of $user. $backuproot doesn't exist."
exit
fi
+
for rottype in daily weekly monthly; do
seconds=\$((seconds_\${rottype}))
@@ -333,7 +334,7 @@ if [ "$backup" == "yes" ]; then
do_user $testuser $btype
else
[ -d "$stripped_srcdir" ] || fatal "directory $stripped_srcdir not found."
- for user in `$DOVEADM user \* | cut -d@ -f1`
+ for user in `@DOVEADM@ user \* | cut -d@ -f1`
do
debug $user
[ "$user" != "" ] || continue
diff --git a/src/backupninja.in b/src/backupninja.in
index 0f74906..3b546b4 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -508,6 +508,8 @@ getconf PGSQLUSER postgres
getconf GZIP /bin/gzip
getconf GZIP_OPTS --rsyncable
getconf RSYNC /usr/bin/rsync
+getconf DSYNC /usr/bin/dsync
+getconf DOVEADM /usr/bin/doveadm
getconf admingroup root
# initialize vservers support