diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /modules/rsnapshot/templates | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'modules/rsnapshot/templates')
| -rw-r--r-- | modules/rsnapshot/templates/cron_file | 2 | ||||
| -rw-r--r-- | modules/rsnapshot/templates/rsnapshot.conf | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/rsnapshot/templates/cron_file b/modules/rsnapshot/templates/cron_file index e484a88e..43ca9e1b 100644 --- a/modules/rsnapshot/templates/cron_file +++ b/modules/rsnapshot/templates/cron_file @@ -1,5 +1,5 @@ #!/bin/sh <%- for conf in @rsnapshot_conf -%> -/usr/bin/rsnapshot -c <%= @conf %> <%= @rsnapshot_arg %> +/usr/bin/rsnapshot -c <%= conf %> <%= rsnapshot_arg %> <%- end -%> diff --git a/modules/rsnapshot/templates/rsnapshot.conf b/modules/rsnapshot/templates/rsnapshot.conf index f8d97018..2ec5edcf 100644 --- a/modules/rsnapshot/templates/rsnapshot.conf +++ b/modules/rsnapshot/templates/rsnapshot.conf @@ -24,7 +24,7 @@ config_version 1.2 # All snapshots will be stored under this root directory. # -snapshot_root <%= @snapshot_root %> +snapshot_root <%= snapshot_root %> # If no_create_root is enabled, rsnapshot will not automatically create the # snapshot_root directory. This is particularly useful if you are backing @@ -201,9 +201,9 @@ link_dest 1 ############################### <%- for b in @backup -%> -<%= @b.split().unshift("backup").join("\t") %> +<%= b.split().unshift("backup").join("\t") %> <%- end -%> <%- for bs in @backup_script -%> -<%= @bs.split().unshift("backup_script").join("\t") %> +<%= bs.split().unshift("backup_script").join("\t") %> <%- end -%> |