diff options
| -rw-r--r-- | manifests/dselect.pp | 9 | ||||
| -rw-r--r-- | manifests/init.pp | 3 | ||||
| -rw-r--r-- | templates/20proxy.erb | 2 | ||||
| -rw-r--r-- | templates/Debian/apticron_lenny.erb | 18 | ||||
| -rw-r--r-- | templates/Debian/apticron_squeeze.erb | 18 | ||||
| -rw-r--r-- | templates/Debian/apticron_wheezy.erb | 18 | ||||
| -rw-r--r-- | templates/Debian/sources.list.erb | 52 | ||||
| -rw-r--r-- | templates/preferences_snippet.erb | 6 | ||||
| -rw-r--r-- | templates/preferences_snippet_release.erb | 6 |
9 files changed, 66 insertions, 66 deletions
diff --git a/manifests/dselect.pp b/manifests/dselect.pp index 6feeb9f..2b99a43 100644 --- a/manifests/dselect.pp +++ b/manifests/dselect.pp @@ -1,9 +1,10 @@ +# manage dselect, like +# suppressing the annoying help texts class apt::dselect { - # suppress annoying help texts of dselect - line { 'dselect_expert': - file => '/etc/dpkg/dselect.cfg', - line => 'expert', + file_line { 'dselect_expert': + path => '/etc/dpkg/dselect.cfg', + line => 'expert', } package { 'dselect': ensure => installed } diff --git a/manifests/init.pp b/manifests/init.pp index 2814013..0fb4f1b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -113,9 +113,8 @@ class apt( # backports uses the normal archive key now package { 'debian-backports-keyring': ensure => absent } - include common::moduledir + common::module_dir { 'apt': } $apt_base_dir = "${common::moduledir::module_dir_path}/apt" - modules_dir { 'apt': } if $custom_key_dir { file { "${apt_base_dir}/keys.d": diff --git a/templates/20proxy.erb b/templates/20proxy.erb index ea706b6..520e7b1 100644 --- a/templates/20proxy.erb +++ b/templates/20proxy.erb @@ -1,5 +1,5 @@ // This file is managed by Puppet // all local modifications will be overwritten -Acquire::http { Proxy "<%= proxy %>:<%= port %>"; }; +Acquire::http { Proxy "<%= @proxy %>:<%= @port %>"; }; Acquire::HTTP::Proxy::bugs.debian.org "DIRECT"; 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 -%> 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 -%> # diff --git a/templates/Debian/apticron_wheezy.erb b/templates/Debian/apticron_wheezy.erb index d8c8804..655854e 100644 --- a/templates/Debian/apticron_wheezy.erb +++ b/templates/Debian/apticron_wheezy.erb @@ -25,9 +25,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 @@ -35,9 +35,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 separated list of reachable addresses for @@ -45,9 +45,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 -%> # # Set NOTIFY_HOLDS="0" if you don't want to be notified about new versions of diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 8c9b28d..37f1c35 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -5,14 +5,14 @@ # basic deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %> -<% if scope.lookupvar('apt::include_src') -%> +<% if include_src=scope.lookupvar('apt::include_src') -%> deb-src <%= debian_url %> <%= codename %> <%= lrepos %> <% end -%> # security <% if ((release=scope.lookupvar('apt::release')) == "stable" || release == "oldstable") -%> deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %> -<% if include_src -%> +<% if include_src -%> deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %> <% end -%> <% else -%> @@ -24,22 +24,22 @@ deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %> # There is no backports archive for <%= release %> <% else -%> deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %> -<% if include_src -%> +<% if include_src -%> deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %> -<% end -%> -<% end -%> +<% end + end -%> <% if use_volatile=scope.lookupvar('apt::use_volatile') -%> # volatile -<% if (release == "testing" || release == "unstable" || release == "experimental") -%> +<% if (release == "testing" || release == "unstable" || release == "experimental") -%> # There is no volatile archive for <%= release %> -<% else -%> +<% else -%> deb <%= debian_url %> <%= codename %>-updates <%= lrepos %> -<% if include_src -%> +<% if include_src -%> deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %> -<% end -%> -<% end -%> -<% end -%> +<% end + end + end -%> <% if use_lts=scope.lookupvar('apt::use_lts') -%> # LTS @@ -58,29 +58,29 @@ deb-src <%= debian_url %> <%= codename %>-lts <%= lrepos %> # basic deb <%= debian_url %> <%= next_codename %> <%= lrepos %> -<% if include_src then -%> +<% if include_src -%> deb-src <%= debian_url %> <%= next_codename %> <%= lrepos %> -<% end -%> +<% end -%> # security -<% if (next_release == "unstable" || next_release == "experimental") -%> +<% if (next_release == "unstable" || next_release == "experimental") -%> # There is no security support for <%= next_release %> -<% else -%> +<% else -%> deb <%= security_url %> <%= next_codename %>/updates <%= lrepos %> -<% if include_src then -%> +<% if include_src then -%> deb-src <%= security_url %> <%= next_codename %>/updates <%= lrepos %> -<% end -%> -<% end -%> +<% end + end -%> -<% if use_volatile -%> +<% if use_volatile -%> # volatile -<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%> +<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%> # There is no volatile archive for <%= next_release %> -<% else -%> +<% else -%> deb <%= debian_url %> <%= next_codename %>-updates <%= lrepos %> -<% if include_src then -%> +<% if include_src -%> deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %> -<% end -%> -<% end -%> -<% end -%> -<% end -%> +<% end + end + end + end -%> diff --git a/templates/preferences_snippet.erb b/templates/preferences_snippet.erb index b7acaab..903e73d 100644 --- a/templates/preferences_snippet.erb +++ b/templates/preferences_snippet.erb @@ -1,4 +1,4 @@ -Package: <%= real_package %> -Pin: <%= pin %> -Pin-Priority: <%= priority %> +Package: <%= @real_package %> +Pin: <%= @pin %> +Pin-Priority: <%= @priority %> diff --git a/templates/preferences_snippet_release.erb b/templates/preferences_snippet_release.erb index 845d23f..b95d3f8 100644 --- a/templates/preferences_snippet_release.erb +++ b/templates/preferences_snippet_release.erb @@ -1,4 +1,4 @@ -Package: <%= real_package %> -Pin: release a=<%= release %> -Pin-Priority: <%= priority %> +Package: <%= @real_package %> +Pin: release a=<%= @release %> +Pin-Priority: <%= @priority %> |