Merge pull request voxpupuli#1016 from darkstego/master

Switched apt::source key from string to hash.
cegeka · Apr 11, 2017 · c104b98 · c104b98
2 parents 7be96d6 + 3962ab3
commit c104b98
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
@@ -37,21 +37,21 @@
         apt::source { 'nginx':
           location => "https://nginx.org/packages/${distro}",
           repos    => 'nginx',
-          key      => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
+          key      => {'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62'},
         }
       }
       'nginx-mainline': {
         apt::source { 'nginx':
           location => "https://nginx.org/packages/mainline/${distro}",
           repos    => 'nginx',
-          key      => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
+          key      => {'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62'},
         }
       }
       'passenger': {
         apt::source { 'nginx':
           location => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
           repos    => 'main',
-          key      => '16378A33A6EF16762922526E561F9B9CAC40B2F7',
+          key      => {'id' => '16378A33A6EF16762922526E561F9B9CAC40B2F7'},
         }
 
         ensure_packages([ 'apt-transport-https', 'ca-certificates' ])

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
@@ -161,7 +161,7 @@
           is_expected.to contain_apt__source('nginx').with(
             'location'   => "https://nginx.org/packages/#{operatingsystem.downcase}",
             'repos'      => 'nginx',
-            'key'        => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62'
+            'key'        => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' }
           )
         end
         it { is_expected.to contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::debian]') }
@@ -185,7 +185,7 @@
           is_expected.to contain_apt__source('nginx').with(
             'location'   => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
             'repos'      => 'main',
-            'key'        => '16378A33A6EF16762922526E561F9B9CAC40B2F7'
+            'key'        => { 'id' => '16378A33A6EF16762922526E561F9B9CAC40B2F7' }
           )
         end
       end