set autotools markers and default application paths

diff --git a/handlers/dsync.in b/handlers/dsync.in
index 6752dad4b3cc74cd9deabbe21b6a482182753f86..d63b3be7c4d7e82d99cc255fd01f3a8b3fabdcd1 100644 (file)
--- 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 0f74906d843b147009a4d20c44ec0601fc5c2bad..3b546b4fada03046a6baa8fe93f4451d890a4810 100755 (executable)
--- 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