]> gitweb.fluxo.info Git - puppet-backup.git/commitdiff
Fix variable deprecations on templates
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 20 Oct 2015 16:11:01 +0000 (14:11 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 20 Oct 2015 16:11:01 +0000 (14:11 -0200)
templates/duplicity.conf.erb

index 03c93429049ec6214d8756b4370545a5fca554b8..6a4f68c12568ba73c31e932466ce5e80e00f4529 100644 (file)
@@ -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