custom server backup_dir
Change-Id: I738260d4ea4c86b1ab114ae42d0030cba3b69871
diff --git a/README.rst b/README.rst
index f8834b6..3f60542 100644
--- a/README.rst
+++ b/README.rst
@@ -46,6 +46,7 @@
hours_before_full: 24
target:
host: cfg01
+ backup_dir: server-home-dir
.. note:: full_backups_to_keep param states how many backup will be stored locally on zookeeper client.
More options to relocate local backups can be done using salt-formula-backupninja.
diff --git a/zookeeper/files/backup/zookeeper-backup-client-runner.sh b/zookeeper/files/backup/zookeeper-backup-client-runner.sh
index 7a3c4ff..d18dc78 100644
--- a/zookeeper/files/backup/zookeeper-backup-client-runner.sh
+++ b/zookeeper/files/backup/zookeeper-backup-client-runner.sh
@@ -5,6 +5,7 @@
# Configuration
# -------------
BACKUPDIR="{{ backup.backup_dir }}/full"
+ SERVERBACKUPDIR="{{ backup.client.target.get('backup_dir', backup.backup_dir) }}"
TMPDIR="$( pwd )/${PROGNAME}.tmp${RANDOM}"
TMPLOG="zookeeper-tmplog.log"
ZOOKEEPERDIR="/var/lib/zookeeper/version-2/"
@@ -79,7 +80,7 @@
ssh-keygen -R {{ backup.client.target.host }} 2>&1 | > $RSYNCLOG
ssh-keyscan {{ backup.client.target.host }} >> ~/.ssh/known_hosts 2>&1 | >> $RSYNCLOG
echo "Rsyncing files to remote host"
- /usr/bin/rsync -rhtPv --rsync-path=rsync --progress $BACKUPDIR/* -e ssh zookeeper@{{ backup.client.target.host }}:$BACKUPDIR >> $RSYNCLOG
+ /usr/bin/rsync -rhtPv --rsync-path=rsync --progress $BACKUPDIR/* -e ssh zookeeper@{{ backup.client.target.host }}:$SERVERBACKUPDIR >> $RSYNCLOG
if [ -s $RSYNCLOG ] && ! grep -q "rsync error: " $RSYNCLOG; then
echo "Rsync to remote host completed OK"