From 1e1e4b566ed2b7ce7c822365e32b26974afbc756 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Fri, 20 May 2016 17:54:29 +0100
Subject: [PATCH] Use hkps.pool.sks-keyservers.net instead of pgp.mit.edu

The MIT server is sometimes unreliable during tests. The pool should
provide a much stabler service.
---
 examples/backports.pp                    | 2 +-
 examples/key.pp                          | 2 +-
 examples/source.pp                       | 6 +++---
 spec/acceptance/apt_key_provider_spec.rb | 8 ++++----
 spec/acceptance/apt_spec.rb              | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/backports.pp b/examples/backports.pp
index 0dfe084..5f1f1ee 100644
--- 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 cc8681f..18c2dd0 100644
--- 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 33dc2a1..86cab2f 100644
--- 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 6c4fe40..04b983c 100644
--- 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 d3bd761..5c389e3 100644
--- 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',
             },
           },
         }
-- 
2.45.2