Use Debian's new official mirrors redirector

See https://www.debian.org/News/weekly/2015/05/#httpredir

diff --git a/README.md b/README.md
index 0592202f5ab27a62842d4a418ebf6670c34f7f8b..fa7c3de698b39b24f1508e77f522ec55e0d88820 100644 (file)
--- a/README.md
+++ b/README.md
@@ -263,8 +263,8 @@ Manages backports.
 
 * `location`: Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Defaults:
 
-  * Debian (squeeze): 'http://backports.debian.org/debian-backports'
-  * Debian (other): 'http://ftp.debian.org/debian/'
+  * Debian (squeeze): 'http://httpredir.debian.org/debian-backports'
+  * Debian (other): 'http://httpredir.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` define, 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 d4f838946a342dfcbc7059d2138037b52203841c..cdf8e6e09f2e64e74f6a0dd07c05578fbcc631a6 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -105,14 +105,14 @@ class apt::params {
       case $xfacts['lsbdistcodename'] {
         'squeeze': {
           $backports = {
-            'location' => 'http://backports.debian.org/debian-backports',
+            'location' => 'http://httpredir.debian.org/debian-backports',
             'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
             'repos'    => 'main contrib non-free',
           }
         }
         default: {
           $backports = {
-            'location' => 'http://ftp.debian.org/debian/',
+            'location' => 'http://httpredir.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 efaa9cc955ad965fff8eb64daca730d0129cae4a..a80af1e4bdc02fe21f51967f69d9d65ec52a51dd 100644 (file)
--- a/spec/classes/apt_backports_spec.rb
+++ b/spec/classes/apt_backports_spec.rb
@@ -14,7 +14,7 @@ describe 'apt::backports', :type => :class do
         }
       end
       it { is_expected.to contain_apt__source('backports').with({
-        :location => 'http://ftp.debian.org/debian/',
+        :location => 'http://httpredir.debian.org/debian',
         :key      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
         :repos    => 'main contrib non-free',
         :release  => 'wheezy-backports',
@@ -32,7 +32,7 @@ describe 'apt::backports', :type => :class do
         }
       end
       it { is_expected.to contain_apt__source('backports').with({
-        :location => 'http://backports.debian.org/debian-backports',
+        :location => 'http://httpredir.debian.org/debian-backports',
         :key      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
         :repos    => 'main contrib non-free',
         :release  => 'squeeze-backports',