diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-08-20 11:32:52 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-08-20 11:32:52 -0300 |
| commit | 9afb297ee9ea87061b83fa17d4195946443ed80e (patch) | |
| tree | f3e928eb3bdc4ee272deb709a7f6c9d86c0f990a /templates | |
| parent | 3bc1d3326b743b11687d78555dca4c9cfa204f52 (diff) | |
| download | puppet-backup-9afb297ee9ea87061b83fa17d4195946443ed80e.tar.gz puppet-backup-9afb297ee9ea87061b83fa17d4195946443ed80e.tar.bz2 | |
Changes for autoloading
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/dup.conf.erb | 4 | ||||
| -rw-r--r-- | templates/rdiff-check.sh.erb | 8 | ||||
| -rw-r--r-- | templates/rsync-check.sh.erb | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb index ea5dccf..03c9342 100644 --- a/templates/dup.conf.erb +++ b/templates/dup.conf.erb @@ -13,10 +13,10 @@ REMOVE_OLDER_THAN="<%= remove_older_than %>" REMOVE_ALL_BUT_N_FULL="<%= remove_all_but_n_full %>" ENCRYPT_KEY="<%= encryptkey %>" SIGN_KEY="<%= encryptkey %>" -<% backup_exclude_unencrypted.each do |del| -%> +<% exclude_unencrypted.each do |del| -%> EXCLUDE="$EXCLUDE --exclude <%= del %>" <% end -%> -<% backup_include_unencrypted.each do |add| -%> +<% include_unencrypted.each do |add| -%> INCLUDE="$INCLUDE --include <%= add %>" <% end -%> diff --git a/templates/rdiff-check.sh.erb b/templates/rdiff-check.sh.erb index 947370c..ebd77f7 100644 --- a/templates/rdiff-check.sh.erb +++ b/templates/rdiff-check.sh.erb @@ -3,7 +3,7 @@ # Check rdiff backup sets. # -BACKUP_FOLDER="<%= backupdir_remote %>" +BACKUP_FOLDER="<%= scope.lookupvar('backup::params::backupdir_remote') %>" if [ -e "$BACKUP_FOLDER" ]; then cwd="`pwd`" @@ -17,12 +17,12 @@ if [ -e "$BACKUP_FOLDER" ]; then rdiff-backup --list-increment-sizes $set; - if [ -d "$set/<%= backupdir %>/duplicity" ] && [ "$1" != "--short" ]; then + if [ -d "$set/<%= scope.lookupvar('backup::params::backupdir') %>/duplicity" ] && [ "$1" != "--short" ]; then echo " " - echo "Checking duplicity backup found at $set/<%= backupdir %>/duplicity..." + echo "Checking duplicity backup found at $set/<%= scope.lookupvar('backup::params::backupdir') %>/duplicity..." echo "======================================================" echo " " - duplicity collection-status file:///$BACKUP_FOLDER/$set/<%= backupdir %>/duplicity + duplicity collection-status file:///$BACKUP_FOLDER/$set/<%= scope.lookupvar('backup::params::backupdir') %>/duplicity fi done diff --git a/templates/rsync-check.sh.erb b/templates/rsync-check.sh.erb index a33606d..6274238 100644 --- a/templates/rsync-check.sh.erb +++ b/templates/rsync-check.sh.erb @@ -3,7 +3,7 @@ # Check rsync backup sets. # -BACKUP_FOLDER="<%= backupdir_remote %>" +BACKUP_FOLDER="<%= scope.lookupvar('backup::params::backupdir_remote') %>" if [ -e "$BACKUP_FOLDER" ]; then cwd="`pwd`" @@ -13,7 +13,7 @@ if [ -e "$BACKUP_FOLDER" ]; then created="`find $set -name 'created' 2> /dev/null | sort`" rotated="`find $set -name 'rotated' 2> /dev/null | sort`" - if [ ! -z "$created" ] || [ -d "$set/<%= backupdir %>/duplicity" ]; then + if [ ! -z "$created" ] || [ -d "$set/<%= scope.lookupvar('backup::params::backupdir') %>/duplicity" ]; then echo " " echo "Checking backup set $set..." echo "======================================================" @@ -38,13 +38,13 @@ if [ -e "$BACKUP_FOLDER" ]; then fi # Check duplicity metadata - if [ -d "$set/<%= backupdir %>/duplicity" ] && [ "$1" != "--short" ]; then - for duplicity in `ls -1 $set/<%= backupdir %>/duplicity | grep -v metadata | xargs`; do + if [ -d "$set/<%= scope.lookupvar('backup::params::backupdir') %>/duplicity" ] && [ "$1" != "--short" ]; then + for duplicity in `ls -1 $set/<%= scope.lookupvar('backup::params::backupdir') %>/duplicity | grep -v metadata | xargs`; do echo " " - echo "Checking duplicity backup found at $set/<%= backupdir %>/duplicity/$duplicity..." + echo "Checking duplicity backup found at $set/<%= scope.lookupvar('backup::params::backupdir') %>/duplicity/$duplicity..." echo "======================================================" echo " " - duplicity collection-status file:///$BACKUP_FOLDER/$set/<%= backupdir %>/duplicity/$duplicity + duplicity collection-status file:///$BACKUP_FOLDER/$set/<%= scope.lookupvar('backup::params::backupdir') %>/duplicity/$duplicity done fi done |