Merge pull request #990 from puppetlabs/apt_keyserver

carabasdaniel · web-flow · commit 5f91c2df3fc4 · 2021-07-07T10:32:54.000+03:00
Replace sks-keyservers.net as is deprecated
diff --git 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
@@ -6,6 +6,6 @@
   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
@@ -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
@@ -8,7 +8,7 @@
   repos    => 'main',
   key      => {
     id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
 }
 
@@ -19,7 +19,7 @@
   repos    => 'main contrib non-free',
   key      => {
     id     => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-    server => 'hkps.pool.sks-keyservers.net',
+    server => 'keyserver.ubuntu.com',
   },
   pin      => '-10',
 }
@@ -29,7 +29,7 @@
   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
@@ -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
@@ -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
@@ -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
@@ -10,7 +10,7 @@
           'repos'    => 'main',
           'key'      => {
             'id'     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-            'server' => 'pool.sks-keyservers.net',
+            'server' => 'keyserver.ubuntu.com',
           },
         },
       }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`repos => 'main universe multiverse restricted',`
`7`	`7`	`key => {`
`8`	`8`	`id => '630239CC130E1A7FD81A27B140976EAF437D05B5',`
`9`		`- server => 'hkps.pool.sks-keyservers.net',`
	`9`	`+ server => 'keyserver.ubuntu.com',`
`10`	`10`	`},`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# Declare Apt key for apt.puppetlabs.com source`
`2`	`2`	`apt::key { 'puppetlabs':`
`3`	`3`	`id => 'D6811ED3ADEEB8441AF5AA8F4528B6CD9E61EF26',`
`4`		`- server => 'hkps.pool.sks-keyservers.net',`
	`4`	`+ server => 'keyserver.ubuntu.com',`
`5`	`5`	`options => 'http-proxy="http://proxyuser:[email protected]:3128"',`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`# repos => 'main universe multiverse restricted',`
`8`	`8`	`# key => {`
`9`	`9`	`# id => '630239CC130E1A7FD81A27B140976EAF437D05B5',`
`10`		`-# server => 'hkps.pool.sks-keyservers.net',`
	`10`	`+# server => 'keyserver.ubuntu.com',`
`11`	`11`	`# },`
`12`	`12`	`# }`
`13`	`13`	`#`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# @example Declare Apt key for apt.puppetlabs.com source`
`7`	`7`	`# apt::key { 'puppetlabs':`
`8`	`8`	`# id => '6F6B15509CF8E59E6E469F327F438280EF8D349F',`
`9`		`-# server => 'hkps.pool.sks-keyservers.net',`
	`9`	`+# server => 'keyserver.ubuntu.com',`
`10`	`10`	`# options => 'http-proxy="http://proxyuser:[email protected]:3128"',`
`11`	`11`	`# }`
`12`	`12`	`#`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# repos => 'main',`
`7`	`7`	`# key => {`
`8`	`8`	`# id => '6F6B15509CF8E59E6E469F327F438280EF8D349F',`
`9`		`-# server => 'hkps.pool.sks-keyservers.net',`
	`9`	`+# server => 'keyserver.ubuntu.com',`
`10`	`10`	`# },`
`11`	`11`	`# }`
`12`	`12`	`#`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`'repos' => 'main',`
`11`	`11`	`'key' => {`
`12`	`12`	`'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F',`
`13`		`- 'server' => 'pool.sks-keyservers.net',`
	`13`	`+ 'server' => 'keyserver.ubuntu.com',`
`14`	`14`	`},`
`15`	`15`	`},`
`16`	`16`	`}`