Replace sks-keyservers.net(deprecated) with keyserver.ubuntu.com

test

Repair changelog and history files

diff --git a/REFERENCE.md b/REFERENCE.md
index 6d544ccf8a8c3fd29683d6a3b114b7a0b09cac3c..2e7310991ea9a9277ac03fb67748137acc15c3c3 100644 (file)
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -397,7 +397,7 @@ class { 'apt::backports':
   repos    => 'main universe multiverse restricted',
   key      => {
     id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }
 ```
@@ -541,7 +541,7 @@ Manages the GPG keys that Apt uses to authenticate packages.
 ```puppet
 apt::key { 'puppetlabs':
   id      => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-  server  => 'hkps.pool.sks-keyservers.net',
+  server  => 'keyserver.ubuntu.com',
   options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
 }
 ```
@@ -914,7 +914,7 @@ apt::source { 'puppetlabs':
   repos    => 'main',
   key      => {
     id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }
 ```

diff --git a/examples/backports.pp b/examples/backports.pp
index 66e08e34c29f8dcfc25773308987e1902c5522df..ff566666290fd7c5282ba15bfa031a2627c59b09 100644 (file)
--- a/examples/backports.pp
+++ b/examples/backports.pp
@@ -6,6 +6,6 @@ class { 'apt::backports':
   repos    => 'main universe multiverse restricted',
   key      => {
     id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }

diff --git a/examples/key.pp b/examples/key.pp
index f6aa392a8a07d239ad7145b8fd4a6ad891b69591..478073c1968c71c6d6776c638e801c60dbe78b89 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      => 'D6811ED3ADEEB8441AF5AA8F4528B6CD9E61EF26',
-  server  => 'hkps.pool.sks-keyservers.net',
+  server  => 'keyserver.ubuntu.com',
   options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
 }

diff --git a/examples/source.pp b/examples/source.pp
index 3e381266f3133f2a4c537f36f0987d97211b7397..c4791af5e14a25758cb18ee43e2ef749251fec13 100644 (file)
--- a/examples/source.pp
+++ b/examples/source.pp
@@ -8,7 +8,7 @@ apt::source { 'puppetlabs':
   repos    => 'main',
   key      => {
     id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }
 
@@ -19,7 +19,7 @@ apt::source { 'debian_testing':
   repos    => 'main contrib non-free',
   key      => {
     id     => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
   pin      => '-10',
 }
@@ -29,7 +29,7 @@ apt::source { 'debian_unstable':
   repos    => 'main contrib non-free',
   key      => {
     id     => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
   pin      => '-10',
 }

diff --git a/manifests/backports.pp b/manifests/backports.pp
index 39e6f6c0d8d81260514f56deadd53d17bd686b94..080c83dd350eb2a8027f88d691ace3f2e2f81bc8 100644 (file)
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -7,7 +7,7 @@
 #     repos    => 'main universe multiverse restricted',
 #     key      => {
 #       id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-#       server => 'hkps.pool.sks-keyservers.net',
+#       server => 'keyserver.ubuntu.com',
 #     },
 #   }
 #

diff --git a/manifests/key.pp b/manifests/key.pp
index 77e6095c87e7a0119e2c4c14b452a9ef6e7901ac..48487632c18ccd37ce7d7eb46afda15a7083e578 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -6,7 +6,7 @@
 # @example Declare Apt key for apt.puppetlabs.com source
 #   apt::key { 'puppetlabs':
 #     id      => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-#     server  => 'hkps.pool.sks-keyservers.net',
+#     server  => 'keyserver.ubuntu.com',
 #     options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
 #   }
 #

diff --git a/manifests/source.pp b/manifests/source.pp
index bc4675b78963ecbb7804cac83676d3960845539e..57c210f48885542ca0abb73a27448bea65e39ad6 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -6,7 +6,7 @@
 #     repos    => 'main',
 #     key      => {
 #       id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-#       server => 'hkps.pool.sks-keyservers.net',
+#       server => 'keyserver.ubuntu.com',
 #     },
 #   }
 #

diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
index 6dc4de92a110c0c17e3edebf46a9b7fc4a05b9be..7e4fe3787b27d86521ac840e837fa6082f084dab 100644 (file)
--- a/spec/acceptance/apt_spec.rb
+++ b/spec/acceptance/apt_spec.rb
@@ -10,7 +10,7 @@ everything_everything_pp = <<-MANIFEST
           'repos'    => 'main',
           'key'      => {
             'id'     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-            'server' => 'pool.sks-keyservers.net',
+            'server' => 'keyserver.ubuntu.com',
           },
         },
       }