Merge pull request #150 from bionix/use_http_debian_net_as_geodns_redirector

Use the geoDNS http.debian.net instead of the main debian ftp server

diff --git a/manifests/params.pp b/manifests/params.pp
index 99e8d40d861ba769f0c213c3386d2ddb00ed2891..955954fe89f65ea1e9e00f7aaaaf9fe5a5a610c5 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -11,6 +11,9 @@ class apt::params {
         'squeeze': {
           $backports_location = 'http://backports.debian.org/debian-backports'
         }
+        'wheezy': {
+          $backports_location = 'http://ftp.debian.org/debian/'
+        }
         default: {
           $backports_location = 'http://http.debian.net/debian/'
         }

diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
index ae91e585faec0fed07290a0efbdd82b27435ff46..dfaf09c572c93522f58908876c113aa498b12074 100644 (file)
--- a/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@ -67,13 +67,13 @@ describe 'apt::ppa', :type => :define do
              proxy_host => false
           }'
         end
-          let :filename do
-            "#{title}-#{release}.list"
-          end
+        let :filename do
+          "#{title}-#{release}.list"
+        end
 
         it { should contain_exec("add-apt-repository-#{title}").with(
           'environment' => [],
-          'command'     => "/usr/bin/add-apt-repository #{title}",
+          'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
           'creates'     => "/etc/apt/sources.list.d/#{filename}",
           'require'     => ["File[/etc/apt/sources.list.d]", "Package[#{package}]"],
           'notify'      => "Exec[apt_update]"