diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp index 2493e36..f9a5cdb 100644 --- a/manifests/repo/debian.pp +++ b/manifests/repo/debian.pp @@ -20,23 +20,24 @@ ensure_packages(['apt-transport-https']) } - if !defined(Apt::Source[$repo_name]) { - apt::source { $repo_name: - location => $baseurl, - release => $release, - repos => $repos, - pin => $pin, - include_src => false, - required_packages => ['apt-transport-https'], - require => File['/etc/apt/trusted.gpg.d/graylog2-keyring.gpg'] + if !defined(Apt::Key[$repo_name]) { + apt::key { $repo_name: + key => '28AB6EB572779C2AD196BE22D44C1D8DB1606F22', + key_server => 'hkp://pgp.surfnet.nl:80' } + } - file {'/etc/apt/trusted.gpg.d/graylog2-keyring.gpg': - ensure => present, - owner => 'root', - group => 'root', - mode => '0444', - source => 'puppet:///modules/graylog2/graylog2-keyring.gpg', + if !defined(Apt::Source[$repo_name]) { + apt::source { $repo_name: + location => $baseurl, + release => $release, + repos => $repos, + pin => $pin, + include_src => false, + require => [ + Package['apt-transport-https'], + Apt::Key[$repo_name], + ], } } }