Excluding $backupdir/restore from backups; adding short mode for rsync and rdiff...

diff --git a/manifests/init.pp b/manifests/init.pp
index 016e1cc8fd32b53e220df78a990bdd33aefb15d5..767a7b49ccf8b82286cb5242d91a1e27fb477d4f 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,7 +26,7 @@ $backupdir_remote = "$backupdir/remote"
 
 # for data that's going to be encrypted and signed
 $backup_include_unencrypted = [ "/etc", "/var", "/home", ]
-$backup_exclude_unencrypted = [ "$backupdir_remote", "$backupdir/duplicity", "/var/cache", "/var/log", "/var/vservers", "/var/chroot", "/root/.cache" ]
+$backup_exclude_unencrypted = [ "$backupdir_remote", "$backupdir/duplicity", "$backupdir/restore", "/var/cache", "/var/log", "/var/vservers", "/var/chroot", "/root/.cache" ]
 
 # for data that were previously encrypted and signed
 $backup_include_encrypted = [ "$backupdir/duplicity", ]

diff --git a/templates/rdiff-check.sh.erb b/templates/rdiff-check.sh.erb
index a2052ff75f1f1421aff98d0f1eab6c1f519d0d4b..947370c16033db2229fb3439dd0bbfef84732078 100644 (file)
--- a/templates/rdiff-check.sh.erb
+++ b/templates/rdiff-check.sh.erb
@@ -17,7 +17,7 @@ if [ -e "$BACKUP_FOLDER" ]; then
 
     rdiff-backup --list-increment-sizes $set;
 
-    if [ -d "$set/<%= backupdir %>/duplicity" ]; then
+    if [ -d "$set/<%= backupdir %>/duplicity" ] && [ "$1" != "--short" ]; then
       echo " "
       echo "Checking duplicity backup found at $set/<%= backupdir %>/duplicity..."
       echo "======================================================"

diff --git a/templates/rsync-check.sh.erb b/templates/rsync-check.sh.erb
index 07eb42da3103a1f0993c5d550f2ef6d6c15f7fed..a33606d0a97d27ea96bfdeed82a9b69e20399472 100644 (file)
--- a/templates/rsync-check.sh.erb
+++ b/templates/rsync-check.sh.erb
@@ -38,7 +38,7 @@ if [ -e "$BACKUP_FOLDER" ]; then
     fi
 
     # Check duplicity metadata
-    if [ -d "$set/<%= backupdir %>/duplicity" ]; then
+    if [ -d "$set/<%= backupdir %>/duplicity" ] && [ "$1" != "--short" ]; then
       for duplicity in `ls -1 $set/<%= backupdir %>/duplicity | grep -v metadata | xargs`; do
         echo " "
         echo "Checking duplicity backup found at $set/<%= backupdir %>/duplicity/$duplicity..."