From 395dc5ba594edfb98506da5edecd694067d69c12 Mon Sep 17 00:00:00 2001 From: "Erik R. Rygg" Date: Mon, 23 Mar 2015 16:03:56 -0600 Subject: [PATCH 1/3] Changing apt key to 40 characters to support new apt module --- manifests/package/debian.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp index 9e7e31694..a0a912481 100644 --- a/manifests/package/debian.pp +++ b/manifests/package/debian.pp @@ -36,7 +36,7 @@ apt::source { 'nginx': location => "http://nginx.org/packages/${distro}", repos => 'nginx', - key => 'ABF5BD827BD9BF62', + key => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62', key_source => 'http://nginx.org/keys/nginx_signing.key', } } @@ -44,7 +44,7 @@ apt::source { 'nginx': location => "http://nginx.org/packages/mainline/${distro}", repos => 'nginx', - key => 'ABF5BD827BD9BF62', + key => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62', key_source => 'http://nginx.org/keys/nginx_signing.key', } } From 07c43dd214988bd1d3a1358bc04d5bb77bc79608 Mon Sep 17 00:00:00 2001 From: "Erik R. Rygg" Date: Tue, 24 Mar 2015 11:51:52 -0600 Subject: [PATCH 2/3] Add key for passenger and update spec tests --- manifests/package/debian.pp | 2 +- spec/classes/package_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp index a0a912481..4d4f3ebfc 100644 --- a/manifests/package/debian.pp +++ b/manifests/package/debian.pp @@ -52,7 +52,7 @@ apt::source { 'nginx': location => 'https://oss-binaries.phusionpassenger.com/apt/passenger', repos => 'main', - key => '561F9B9CAC40B2F7', + key => '16378A33A6EF16762922526E561F9B9CAC40B2F7', key_source => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt', required_packages => 'apt-transport-https ca-certificates', } diff --git a/spec/classes/package_spec.rb b/spec/classes/package_spec.rb index 6b6ef6f49..8cf8d4bf6 100644 --- a/spec/classes/package_spec.rb +++ b/spec/classes/package_spec.rb @@ -88,7 +88,7 @@ it { is_expected.to contain_apt__source('nginx').with( 'location' => 'https://oss-binaries.phusionpassenger.com/apt/passenger', 'repos' => "main", - 'key' => '561F9B9CAC40B2F7', + 'key' => '16378A33A6EF16762922526E561F9B9CAC40B2F7', 'key_source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt' )} end From 4aa3cdc86ddd64cf6bf6a701a4a18e21a4ed84a8 Mon Sep 17 00:00:00 2001 From: "Erik R. Rygg" Date: Tue, 24 Mar 2015 12:28:46 -0600 Subject: [PATCH 3/3] One more update to the spec test --- spec/classes/package_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/classes/package_spec.rb b/spec/classes/package_spec.rb index 8cf8d4bf6..a153efec8 100644 --- a/spec/classes/package_spec.rb +++ b/spec/classes/package_spec.rb @@ -67,7 +67,7 @@ it { is_expected.to contain_apt__source('nginx').with( 'location' => "http://nginx.org/packages/#{operatingsystem.downcase}", 'repos' => 'nginx', - 'key' => 'ABF5BD827BD9BF62', + 'key' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62', 'key_source' => 'http://nginx.org/keys/nginx_signing.key' )} it { is_expected.to contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::debian]') }