From 9f794959db9c689f71da33cc1345b51045a30f91 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Mon, 25 Sep 2017 12:18:15 +0100
Subject: [PATCH] Switch to deb.debian.org and remove Debian 6.0

---
 README.md                          |  3 +--
 manifests/params.pp                |  9 +--------
 spec/classes/apt_backports_spec.rb | 21 +--------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 35b097d..592c89e 100644
--- a/README.md
+++ b/README.md
@@ -322,8 +322,7 @@ Manages backports.
 
 * `location`: Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Defaults:
 
-  * Debian (squeeze): 'http://httpredir.debian.org/debian-backports'
-  * Debian (other): 'http://httpredir.debian.org/debian'
+  * Debian: 'http://deb.debian.org/debian'
   * Ubuntu: 'http://archive.ubuntu.com/ubuntu'
 
 * `pin`: *Optional.* Specifies a pin priority for the backports. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters. Default: '200'.
diff --git a/manifests/params.pp b/manifests/params.pp
index 87c4a2b..28ddd95 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -73,16 +73,9 @@ class apt::params {
   case $facts['os']['name']{
     'Debian': {
       case $facts['os']['release']['full'] {
-        '6.0': {
-          $backports = {
-            'location' => 'http://httpredir.debian.org/debian-backports',
-            'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-            'repos'    => 'main contrib non-free',
-          }
-        }
         default: {
           $backports = {
-            'location' => 'http://httpredir.debian.org/debian',
+            'location' => 'http://deb.debian.org/debian',
             'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
             'repos'    => 'main contrib non-free',
           }
diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
index 1dfbf37..f2172d9 100644
--- a/spec/classes/apt_backports_spec.rb
+++ b/spec/classes/apt_backports_spec.rb
@@ -15,7 +15,7 @@ describe 'apt::backports', :type => :class do
         }
       end
       it { is_expected.to contain_apt__source('backports').with({
-        :location => 'http://httpredir.debian.org/debian',
+        :location => 'http://deb.debian.org/debian',
         :key      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
         :repos    => 'main contrib non-free',
         :release  => 'wheezy-backports',
@@ -23,25 +23,6 @@ describe 'apt::backports', :type => :class do
       })
       }
     end
-    context 'defaults on squeeze' do
-      let(:facts) do
-        {
-          :os => { :family => 'Debian', :name => 'Debian', :release => { :major => '6', :full => '6.0' }},
-          :lsbdistid       => 'Debian',
-          :osfamily        => 'Debian',
-          :lsbdistcodename => 'squeeze',
-          :puppetversion   => Puppet.version,
-        }
-      end
-      it { is_expected.to contain_apt__source('backports').with({
-        :location => 'http://httpredir.debian.org/debian-backports',
-        :key      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-        :repos    => 'main contrib non-free',
-        :release  => 'squeeze-backports',
-        :pin      => { 'priority' => 200, 'release' => 'squeeze-backports' },
-      })
-      }
-    end
     context 'defaults on ubuntu' do
       let(:facts) do
         {
-- 
2.32.3