aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-10-20 14:11:01 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-10-20 14:11:01 -0200
commitb257950d10849ecaea6eb729ed5fb81f8e209ee5 (patch)
tree033cf1ff3fbc3db19a7e4a147cadfa3d832a1799
parent6f6cd61583fb02c84fe5d3cb1835f16630e94808 (diff)
downloadpuppet-backup-b257950d10849ecaea6eb729ed5fb81f8e209ee5.tar.gz
puppet-backup-b257950d10849ecaea6eb729ed5fb81f8e209ee5.tar.bz2
Fix variable deprecations on templates
-rw-r--r--templates/duplicity.conf.erb18
1 files changed, 9 insertions, 9 deletions
diff --git a/templates/duplicity.conf.erb b/templates/duplicity.conf.erb
index 03c9342..6a4f68c 100644
--- a/templates/duplicity.conf.erb
+++ b/templates/duplicity.conf.erb
@@ -7,16 +7,16 @@
#
# TODO: custom log file
-BACKUP_FOLDER="<%= directory %>"
-FULL_IF_OLDER_THAN="<%= full_if_older_than %>"
-REMOVE_OLDER_THAN="<%= remove_older_than %>"
-REMOVE_ALL_BUT_N_FULL="<%= remove_all_but_n_full %>"
-ENCRYPT_KEY="<%= encryptkey %>"
-SIGN_KEY="<%= encryptkey %>"
-<% exclude_unencrypted.each do |del| -%>
+BACKUP_FOLDER="<%= @directory %>"
+FULL_IF_OLDER_THAN="<%= @full_if_older_than %>"
+REMOVE_OLDER_THAN="<%= @remove_older_than %>"
+REMOVE_ALL_BUT_N_FULL="<%= @remove_all_but_n_full %>"
+ENCRYPT_KEY="<%= @encryptkey %>"
+SIGN_KEY="<%= @encryptkey %>"
+<% @exclude_unencrypted.each do |del| -%>
EXCLUDE="$EXCLUDE --exclude <%= del %>"
<% end -%>
-<% include_unencrypted.each do |add| -%>
+<% @include_unencrypted.each do |add| -%>
INCLUDE="$INCLUDE --include <%= add %>"
<% end -%>
@@ -24,7 +24,7 @@ INCLUDE="$INCLUDE --include <%= add %>"
TMP="/var/tmp"
mkdir -p $TMP
-export PASSPHRASE='<%= password %>'
+export PASSPHRASE='<%= @password %>'
mkdir -p $BACKUP_FOLDER
# adds support for checking the existing backup