diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | templates/Debian/preferences_squeeze.erb | 5 | ||||
| -rw-r--r-- | templates/Debian/sources.list.erb | 10 |
3 files changed, 1 insertions, 16 deletions
@@ -77,7 +77,7 @@ complemented with all of the preferences_snippet calls (see below). If the default preferences template doesn't suit your needs, you can create a template located in your site-apt module, and set $custom_preferences with the -location (eg. $custom_preferences = "puppet:///modules/site-apt/preferences") +content (eg. $custom_preferences = template('site-apt/preferences') ) Setting this variable to false before including this class will force the apt/preferences file to be absent: diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb index 5e15d27..8eb6399 100644 --- a/templates/Debian/preferences_squeeze.erb +++ b/templates/Debian/preferences_squeeze.erb @@ -8,11 +8,6 @@ Package: * Pin: release o=Debian,n=<%= codename %>-updates Pin-Priority: 990 -Explanation: Debian backports -Package: * -Pin: origin backports.debian.org -Pin-Priority: 200 - Explanation: Debian <%= next_codename %> Package: * Pin: release o=Debian,n=<%= next_codename %> diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 3a810e3..b0f490f 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -67,16 +67,6 @@ deb-src <%= security_url %> <%= next_codename %>/updates <%= repos %> <% end -%> <% end -%> -# backports -<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%> -# There is no backports archive for <%= next_release %> -<% else -%> -deb <%= backports_url %> <%= next_codename %>-backports <%= repos %> -<% if include_src then -%> -deb-src <%= backports_url %> <%= next_codename %>-backports <%= repos %> -<% end -%> -<% end -%> - <% if use_volatile -%> # volatile <% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%> |