diff options
| author | intrigeri <intrigeri@boum.org> | 2010-12-15 22:01:34 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-12-15 22:01:34 +0100 |
| commit | 7ffedbad6b55bfc317e5a483da11470d7ce2a861 (patch) | |
| tree | 6b746b94c98bfa65e6d25dc270e87865ae27e3b0 | |
| parent | 75cf15b7c722d980d393fb81ffc85cf0b37ef6da (diff) | |
| parent | 67dc9a22597342d999ec450333fbd44608547442 (diff) | |
| download | puppet-apt-7ffedbad6b55bfc317e5a483da11470d7ce2a861.tar.gz puppet-apt-7ffedbad6b55bfc317e5a483da11470d7ce2a861.tar.bz2 | |
Merge remote branch 'riseup/master'
| -rw-r--r-- | manifests/listchanges.pp | 18 | ||||
| -rw-r--r-- | templates/Debian/apticron_lenny.erb | 12 | ||||
| -rw-r--r-- | templates/Debian/listchanges_lenny.erb | 10 |
3 files changed, 20 insertions, 20 deletions
diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp index 347717e..04cbc52 100644 --- a/manifests/listchanges.pp +++ b/manifests/listchanges.pp @@ -1,37 +1,37 @@ class apt::listchanges { - case $listchanges_version { + case $apt_listchanges_version { '': { $listchanges_version = "present" } } - case $listchanges_config { + case $apt_listchanges_config { '': { $listchanges_config = "apt/${operatingsystem}/listchanges_${lsbdistcodename}.erb" } } - case $listchanges_frontend { + case $apt_listchanges_frontend { '': { $listchanges_frontend = "mail" } } - case $listchanges_email { + case $apt_listchanges_email { '': { $listchanges_email = "root" } } - case $listchanges_confirm { + case $apt_listchanges_confirm { '': { $listchanges_confirm = "0" } } - case $listchanges_saveseen { + case $apt_listchanges_saveseen { '': { $listchanges_saveseen = "/var/lib/apt/listchanges.db" } } - case $listchanges_which { + case $apt_listchanges_which { '': { $listchanges_which = "both" } } - package { apt-listchanges: ensure => $listchanges_ensure_version } + package { apt-listchanges: ensure => $apt_listchanges_ensure_version } file { "/etc/apt/listchanges.conf": - content => template($listchanges_config), + content => template($apt_listchanges_config), mode => 0644, owner => root, group => root, require => Package["apt-listchanges"]; } diff --git a/templates/Debian/apticron_lenny.erb b/templates/Debian/apticron_lenny.erb index e484700..9ec1c6d 100644 --- a/templates/Debian/apticron_lenny.erb +++ b/templates/Debian/apticron_lenny.erb @@ -24,8 +24,8 @@ LISTCHANGES_PROFILE="<%= apticron_listchanges_profile %>" # of "hostname -f" for the system name in the mails it generates # # SYSTEM="foobar.example.com" -<%- if has_variable?(apticron_system) and instance_variable_get("@#{apticron_system}").to_s != "false" -%> -<%= 'SYSTEM="' + instance_variable_get("@#{apticron_system}").to_s + '"' %> +<%- if has_variable?('apticron_system') and instance_variable_get("@#{'apticron_system'}").to_s != "false" -%> +<%= 'SYSTEM="' + instance_variable_get("@#{'apticron_system'}").to_s + '"' %> <%- end -%> # @@ -34,8 +34,8 @@ LISTCHANGES_PROFILE="<%= apticron_listchanges_profile %>" # family type (inet, inet6), if available. # # IPADDRESSNUM="1" -<%- if has_variable?(apticron_ipaddressnum) and instance_variable_get("@#{apticron_ipaddressnum}").to_s != "false" -%> -<%= 'IPADDRESSNUM="' + instance_variable_get("@#{apticron_ipaddressnum}").to_s + '"' %> +<%- if has_variable?('apticron_ipaddressnum') and instance_variable_get("@#{'apticron_ipaddressnum'}").to_s != "false" -%> +<%= 'IPADDRESSNUM="' + instance_variable_get("@#{'apticron_ipaddressnum'}").to_s + '"' %> <%- end -%> # @@ -44,6 +44,6 @@ LISTCHANGES_PROFILE="<%= apticron_listchanges_profile %>" # "ip" command # # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1" -<%- if has_variable?(apticron_ipaddresses) and instance_variable_get("@#{apticron_ipaddresses}").to_s != "false" -%> -<%= 'IPADDRESSES="' + instance_variable_get("@#{apticron_ipaddresses}").to_s + '"' %> +<%- if has_variable?('apticron_ipaddresses') and instance_variable_get("@#{'apticron_ipaddresses'}").to_s != "false" -%> +<%= 'IPADDRESSES="' + instance_variable_get("@#{'apticron_ipaddresses'}").to_s + '"' %> <%- end -%>
\ No newline at end of file diff --git a/templates/Debian/listchanges_lenny.erb b/templates/Debian/listchanges_lenny.erb index fec3b68..3624b39 100644 --- a/templates/Debian/listchanges_lenny.erb +++ b/templates/Debian/listchanges_lenny.erb @@ -1,7 +1,7 @@ [apt] -frontend=<%= listchanges_frontend %> -email_address=<%= listchanges_email %> -confirm=<%= listchanges_confirm %> -save_seen=<%= listchanges_saveseen %> -which=<%= listchanges_which %> +frontend=<%= apt_listchanges_frontend %> +email_address=<%= apt_listchanges_email %> +confirm=<%= apt_listchanges_confirm %> +save_seen=<%= apt_listchanges_saveseen %> +which=<%= apt_listchanges_which %> |