diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-20 16:15:02 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-20 16:15:02 -0500 |
| commit | 8ed07cac2f084bfe542f4978daa783aedd7e79b4 (patch) | |
| tree | 93020168f8979b317c3a7c93e2b8ec154078385a /templates/Debian/apticron_squeeze.erb | |
| parent | e3e0b46ca6039170c2d2faa8b2bebf14460679eb (diff) | |
| parent | 53e78e61fefefe85939a3c3b5efcd147deebca61 (diff) | |
| download | puppet-apt-8ed07cac2f084bfe542f4978daa783aedd7e79b4.tar.gz puppet-apt-8ed07cac2f084bfe542f4978daa783aedd7e79b4.tar.bz2 | |
Merge branch 'master' of git://git.puppet.immerda.ch/module-apt
Conflicts:
templates/Debian/sources.list.erb
Diffstat (limited to 'templates/Debian/apticron_squeeze.erb')
| -rw-r--r-- | templates/Debian/apticron_squeeze.erb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/templates/Debian/apticron_squeeze.erb b/templates/Debian/apticron_squeeze.erb index 580179e..05b7c9b 100644 --- a/templates/Debian/apticron_squeeze.erb +++ b/templates/Debian/apticron_squeeze.erb @@ -26,9 +26,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') % # of "hostname -f" for the system name in the mails it generates # # SYSTEM="foobar.example.com" -<%- unless scope.lookupvar('apt::apticron::system').to_s == "false" -%> -<%= "SYSTEM=\"#{scope.lookupvar('apt::apticron::system')}\"" %> -<%- end -%> +<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%> +SYSTEM="<%= v %>" +<% end -%> # @@ -37,9 +37,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') % # family type (inet, inet6), if available. # # IPADDRESSNUM="1" -<%- unless scope.lookupvar('apt::apticron::ipaddressnum').to_s == "false" -%> -<%= "IPADDRESSNUM=\"#{scope.lookupvar('apt::apticron::ipaddressnum')}\"" %> -<%- end -%> +<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%> +IPADDRESSNUM="<%= v %>" +<% end -%> # @@ -48,9 +48,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') % # "ip" command # # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1" -<%- unless scope.lookupvar('apt::apticron::ipaddresses').to_s == "false" -%> -<%= "IPADDRESSES=\"#{scope.lookupvar('apt::apticron::ipaddresses')}\"" %> -<%- end -%> +<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%> +IPADDRESSES="<%= v %>" +<% end -%> # |