Merge pull request #583 from errygg/errygg-patch-1

Changing apt key to 40 characters to support new apt module
voxpupuli · Mar 24, 2015 · 124b1c0 · 124b1c0
2 parents 0c1d60b + b8c2f44
commit 124b1c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp
@@ -36,23 +36,23 @@
         apt::source { 'nginx':
           location   => "http://nginx.org/packages/${distro}",
           repos      => 'nginx',
-          key        => 'ABF5BD827BD9BF62',
+          key        => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
           key_source => 'http://nginx.org/keys/nginx_signing.key',
         }
       }
       'nginx-mainline': {
         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',
         }
       }
       'passenger': {
         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
@@ -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]') }
@@ -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