Drop Debian lenny and squeeze support.

4 files changed, 3 insertions, 90 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 46e5cb0..2ee4d10 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,7 +11,6 @@ class apt(
   $use_next_release = $apt::params::use_next_release,
   $debian_url = $apt::params::debian_url,
   $security_url = $apt::params::security_url,
-  $backports_url = $apt::params::backports_url,
   $lts_url = $apt::params::lts_url,
   $volatile_url = $apt::params::volatile_url,
   $ubuntu_url = $apt::params::ubuntu_url,
@@ -21,11 +20,6 @@ class apt(
   $custom_key_dir = $apt::params::custom_key_dir
 ) inherits apt::params {
 
-  $real_backports_url = $backports_url ? {
-    false   => $debian_url,
-    default => $backports_url,
-  }
-
   package { 'apt':
     ensure  => installed,
     require => undef,
@@ -84,18 +78,15 @@ class apt(
   ## This package should really always be current
   package { 'debian-archive-keyring': ensure => latest }
 
-  # backports uses the normal archive key now
-  package { 'debian-backports-keyring': ensure => absent }
-
   if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) {
     apt::sources_list {
       'backports':
-        content => "deb ${real_backports_url} ${::debian_codename}-backports ${apt::repos}",
+        content => "deb ${debian_url} ${::debian_codename}-backports ${apt::repos}",
     }
     if $include_src {
       apt::sources_list {
         'backports-src':
-          content => "deb-src ${real_backports_url} ${::debian_codename}-backports ${apt::repos}",
+          content => "deb-src ${debian_url} ${::debian_codename}-backports ${apt::repos}",
       }
     }
   }
diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 50ca23a..aedd56b 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -2,10 +2,7 @@ class apt::preferences {
 
   $pref_contents = $apt::custom_preferences ? {
     ''      => $::operatingsystem ? {
-      'debian' => $::debian_codename ? {
-        'lenny' => template("apt/${::operatingsystem}/preferences_lenny.erb"),
-        default => template("apt/${::operatingsystem}/preferences.erb"),
-      },
+      'debian' => template("apt/${::operatingsystem}/preferences.erb"),
       'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
     },
     default => $apt::custom_preferences
diff --git a/templates/Debian/apticron_lenny.erb b/templates/Debian/apticron_lenny.erb
deleted file mode 100644
index 86b0997..0000000
--- a/templates/Debian/apticron_lenny.erb
+++ /dev/null
@@ -1,50 +0,0 @@
-# apticron.conf
-#
-# set EMAIL to a list of addresses which will be notified of impending updates
-#
-EMAIL="<%= scope.lookupvar('apt::apticron::email') %>"
-
-#
-# Set DIFF_ONLY to "1" to only output the difference of the current run
-# compared to the last run (ie. only new upgrades since the last run). If there
-# are no differences, no output/email will be generated. By default, apticron
-# will output everything that needs to be upgraded.
-#
-DIFF_ONLY="<%= scope.lookupvar('apt::apticron::diff_only') %>"
-
-#
-# Set LISTCHANGES_PROFILE if you would like apticron to invoke apt-listchanges
-# with the --profile option. You should add a corresponding profile to
-# /etc/apt/listchanges.conf
-#
-LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %>"
-
-#
-# Set SYSTEM if you would like apticron to use something other than the output
-# of "hostname -f" for the system name in the mails it generates
-#
-# SYSTEM="foobar.example.com"
-<% 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
-# addresses apticron displays. The default is to display 1 address of each
-# family type (inet, inet6), if available.
-#
-# IPADDRESSNUM="1"
-<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
-IPADDRESSNUM="<%= v %>"
-<% end -%>
-
-#
-# Set IPADDRESSES to a whitespace seperated list of reachable addresses for
-# this system. By default, apticron will try to work these out using the
-# "ip" command
-#
-# IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
-<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
-IPADDRESSES="<%= v %>"
-<% end -%>
-
diff --git a/templates/Debian/preferences_lenny.erb b/templates/Debian/preferences_lenny.erb
deleted file mode 100644
index 6500168..0000000
--- a/templates/Debian/preferences_lenny.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
-Package: *
-Pin: release o=Debian,a=<%= scope.lookupvar('::debian_release') %>,v=5*
-Pin-Priority: 990
-
-Explanation: Debian backports
-Package: *
-Pin: origin backports.debian.org
-Pin-Priority: 200
-
-Explanation: Debian <%= next_release=scope.lookupvar('::debian_nextrelease') %>
-Package: *
-Pin: release o=Debian,a=<%= next_release %>
-Pin-Priority: 2
-
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,a=unstable
-Pin-Priority: 1
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-