Merge pull request #606 from DavidS/use-key-server-pool

Use hkps.pool.sks-keyservers.net instead of pgp.mit.edu

diff --git a/examples/backports.pp b/examples/backports.pp
index 0dfe084850cf774e121172c3ab8846f8894652d5..5f1f1ee18d57ba56476a2486ab03ac180397fcee 100644 (file)
--- a/examples/backports.pp
+++ b/examples/backports.pp
@@ -6,6 +6,6 @@ apt::backports { 'qiana':
   repos    => 'main universe multiverse restricted',
   key      => {
     id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-    server => 'pgp.mit.edu',
+    server => 'hkps.pool.sks-keyservers.net',
   },
 }

diff --git a/examples/key.pp b/examples/key.pp
index cc8681fbf8aadfb315c143b2065e4d4ee19b8f43..18c2dd0397f3a0527920bf7e72d6d21e00060d96 100644 (file)
--- a/examples/key.pp
+++ b/examples/key.pp
@@ -1,6 +1,6 @@
 # Declare Apt key for apt.puppetlabs.com source
 apt::key { 'puppetlabs':
   id      => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
-  server  => 'pgp.mit.edu',
+  server  => 'hkps.pool.sks-keyservers.net',
   options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
 }

diff --git a/examples/source.pp b/examples/source.pp
index 33dc2a1938601cdc8bde6492be77f1e38baa66fe..86cab2f2d08f48ec3ff96091cd88e00eae097335 100644 (file)
--- a/examples/source.pp
+++ b/examples/source.pp
@@ -8,7 +8,7 @@ apt::source { 'puppetlabs':
   repos    => 'main',
   key      => {
     id     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
-    server => 'pgp.mit.edu',
+    server => 'hkps.pool.sks-keyservers.net',
   },
 }
 
@@ -19,7 +19,7 @@ apt::source { 'debian_testing':
   repos    => 'main contrib non-free',
   key      => {
     id     => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-    server => 'subkeys.pgp.net',
+    server => 'hkps.pool.sks-keyservers.net',
   },
   pin      => '-10',
 }
@@ -29,7 +29,7 @@ apt::source { 'debian_unstable':
   repos    => 'main contrib non-free',
   key      => {
     id     => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-    server => 'subkeys.pgp.net',
+    server => 'hkps.pool.sks-keyservers.net',
   },
   pin      => '-10',
 }

diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
index 6c4fe40d8c934bdfa668e04fedd4065209083ec3..04b983c2d96150af4b2d8f0bd46545a1fb9edf6b 100644 (file)
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -401,13 +401,13 @@ ZTQcCD53HcBLvKX6RJ4ByYawKaQqMa27WK/YWVmFXqVDVk12iKrQW6zktDdGInnD
   end
 
   describe 'server =>' do
-    context 'pgp.mit.edu' do
+    context 'hkps.pool.sks-keyservers.net' do
       it 'works' do
         pp = <<-EOS
         apt_key { 'puppetlabs':
           id     => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
           ensure => 'present',
-          server => 'pgp.mit.edu',
+          server => 'hkps.pool.sks-keyservers.net',
         }
         EOS
 
@@ -417,13 +417,13 @@ ZTQcCD53HcBLvKX6RJ4ByYawKaQqMa27WK/YWVmFXqVDVk12iKrQW6zktDdGInnD
       end
     end
 
-    context 'hkp://pgp.mit.edu:80' do
+    context 'hkp://hkps.pool.sks-keyservers.net:80' do
       it 'works' do
         pp = <<-EOS
         apt_key { 'puppetlabs':
           id     => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
           ensure => 'present',
-          server => 'hkp://pgp.mit.edu:80',
+          server => 'hkp://hkps.pool.sks-keyservers.net:80',
         }
         EOS
 

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index d3bd76174ce8440e6907aff236983075c98af05e..5c389e3eeb0e79a227e61cfeb67fa90264ae32f3 100644 (file)
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -21,7 +21,7 @@ describe 'apt class' do
             'repos'    => 'main',
             'key'      => {
               'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
-              'server' => 'pgp.mit.edu',
+              'server' => 'hkps.pool.sks-keyservers.net',
             },
           },
         }

diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index e9eb6fb9d6463936ef924a18cccf376ba0f72fab..3161cf0278b819b9b38529910b2210122fdd9006 100644 (file)
--- a/spec/classes/params_spec.rb
+++ b/spec/classes/params_spec.rb
@@ -1,9 +1,6 @@
 require 'spec_helper'
 describe 'apt::params', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion   => Puppet.version, } }
-  let (:title) { 'my_package' }
-
-  it { is_expected.to contain_apt__params }
+  let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
 
   # There are 4 resources in this class currently
   # there should not be any more resources because it is a params class
@@ -13,7 +10,7 @@ describe 'apt::params', :type => :class do
   end
 
   describe "With lsb-release not installed" do
-    let(:facts) { { :osfamily => 'Debian', :puppetversion   => Puppet.version, } }
+    let(:facts) { { :osfamily => 'Debian', :puppetversion => Puppet.version, } }
     let (:title) { 'my_package' }
 
     it do