diff options
author | varac <varacanero@zeromail.org> | 2015-04-30 11:27:58 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-04-30 11:27:58 +0200 |
commit | f72c47077aab69170fa1ca56e6ce9a6b1fc9c402 (patch) | |
tree | 773e55de49edd873ca867df73cce83e02f973e52 /templates/Debian/apticron_lenny.erb | |
parent | 721bf57600f9730a56f744150be34aa9e96457f8 (diff) | |
parent | 5a9e3a456e8c9023222abb3ab08ae80323a1470a (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts:
README
manifests/init.pp
manifests/unattended_upgrades.pp
Diffstat (limited to 'templates/Debian/apticron_lenny.erb')
-rw-r--r-- | templates/Debian/apticron_lenny.erb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/templates/Debian/apticron_lenny.erb b/templates/Debian/apticron_lenny.erb index aad9985..86b0997 100644 --- a/templates/Debian/apticron_lenny.erb +++ b/templates/Debian/apticron_lenny.erb @@ -24,9 +24,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 -%> # # Set IPADDRESSNUM if you would like to configure the maximal number of IP @@ -34,9 +34,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 -%> # # Set IPADDRESSES to a whitespace seperated list of reachable addresses for @@ -44,7 +44,7 @@ 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 -%> |