Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added default refresh value to apt::key default unit test
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 27cc09c7a15b2f629df50900e3a715aa285f70c4..f3472aca0097e6ce45505ca34587caf1327736ce 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-208,13
+208,6
@@
class apt (
content => "${confheadertmp}${updatestamptmp}",
}
content => "${confheadertmp}${updatestamptmp}",
}
- # Required for adding GPG keys on Debian 9 (and derivatives)
- $apt_files = [ 'sources.list', 'sources.list.d', 'preferences', 'preferences.d', '/etc/apt/auth.conf' ]
- package { 'dirmngr':
- ensure => present,
- before => [File[$apt_files]]
- }
-
file { 'sources.list':
ensure => file,
path => $::apt::sources_list,
file { 'sources.list':
ensure => file,
path => $::apt::sources_list,
@@
-296,4
+289,7
@@
class apt (
if $pins {
create_resources('apt::pin', $pins)
}
if $pins {
create_resources('apt::pin', $pins)
}
+
+ # required for adding GPG keys on Debian 9 (and derivatives)
+ ensure_packages(['dirmngr'])
}
}