custom server backup_dir
Change-Id: I6295b7e241c83935deccd4e930ed806ef92fde5b
diff --git a/README.rst b/README.rst
index b73a1ad..f539168 100644
--- a/README.rst
+++ b/README.rst
@@ -29,6 +29,7 @@
hours_before_full: 24
target:
host: cfg01
+ home_dir: server-home-dir
.. note:: full_backups_to_keep param states how many backup will be stored locally on cassandra client.
More options to relocate local backups can be done using salt-formula-backupninja.
diff --git a/cassandra/files/backup/cassandra-backup-client-runner-call.sh b/cassandra/files/backup/cassandra-backup-client-runner-call.sh
index 9f3116b..ff71928 100644
--- a/cassandra/files/backup/cassandra-backup-client-runner-call.sh
+++ b/cassandra/files/backup/cassandra-backup-client-runner-call.sh
@@ -11,6 +11,7 @@
DSECFG="/etc/dse/cassandra"
CASCFG='/etc/cassandra/cassandra.yaml'
BACKUPDIR="{{ backup.backup_dir }}/full"
+ SERVERBACKUPDIR="{{ backup.client.target.get('backup_dir', backup.backup_dir) }}"
TMPDIR="$( pwd )/${PROGNAME}.tmp${RANDOM}"
CLITMPFILE="${TMPDIR}/cqlschema"
CASIP="127.0.0.1"
@@ -89,7 +90,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 cassandra@{{ backup.client.target.host }}:$BACKUPDIR >> $RSYNCLOG
+ /usr/bin/rsync -rhtPv --rsync-path=rsync --progress $BACKUPDIR/* -e ssh cassandra@{{ backup.client.target.host }}:$SERVERBACKUPDIR >> $RSYNCLOG
# Check if the rsync succeeded or failed
if [ -s $RSYNCLOG ] && ! grep -q "rsync error: " $RSYNCLOG; then