From 606ccfa80fcda16caace6bc964fe220dc77ef478 Mon Sep 17 00:00:00 2001 From: daiana Date: Mon, 5 Jul 2021 18:45:41 +0300 Subject: [PATCH] Replace sks-keyservers.net(deprecated) with keyserver.ubuntu.com test Repair changelog and history files --- REFERENCE.md | 6 +++--- examples/backports.pp | 2 +- examples/key.pp | 2 +- examples/source.pp | 6 +++--- manifests/backports.pp | 2 +- manifests/key.pp | 2 +- manifests/source.pp | 2 +- spec/acceptance/apt_spec.rb | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 6d544ccf8a..2e7310991e 100644 --- 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 66e08e34c2..ff56666629 100644 --- 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 index f6aa392a8a..478073c196 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 => '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 3e381266f3..c4791af5e1 100644 --- 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 index 39e6f6c0d8..080c83dd35 100644 --- 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 77e6095c87..48487632c1 100644 --- 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 bc4675b789..57c210f488 100644 --- 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 6dc4de92a1..7e4fe3787b 100644 --- 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', }, }, }