diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/.DS_Store differ diff --git a/manifests/repo/.DS_Store b/manifests/repo/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/manifests/repo/.DS_Store differ diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp index 323372c..a405629 100644 --- a/manifests/repo/apt.pp +++ b/manifests/repo/apt.pp @@ -19,26 +19,24 @@ if $::puppet::collection != undef { $lc_collection_name = downcase($::puppet::collection) apt::source { "puppetlabs-${lc_collection_name}": - ensure => 'present', - location => 'http://apt.puppetlabs.com', - repos => $::puppet::collection, - key => '6F6B15509CF8E59E6E469F327F438280EF8D349F', - key_server => 'pgp.mit.edu', + ensure => 'present', + location => 'http://apt.puppetlabs.com', + repos => $::puppet::collection, + key => { + 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', + 'server' => 'pgp.mit.edu', + }, } } else { apt::source { 'puppetlabs': ensure => $source_ensure, location => 'http://apt.puppetlabs.com', - repos => 'main dependencies', - key => '6F6B15509CF8E59E6E469F327F438280EF8D349F', - key_server => 'pgp.mit.edu', + repos => 'main dependencies' } apt::source { 'puppetlabs_devel': ensure => $devel_ensure, location => 'http://apt.puppetlabs.com', - repos => 'devel', - key => '6F6B15509CF8E59E6E469F327F438280EF8D349F', - key_server => 'pgp.mit.edu', + repos => 'devel' } }