Skip to content

Commit

Permalink
(MODULES-6408) - Fix dirmngr install failing
Browse files Browse the repository at this point in the history
  • Loading branch information
eimlav committed Sep 26, 2018
1 parent 9e44e97 commit 7d6876b
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,13 @@
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,
Expand All @@ -217,7 +224,6 @@
content => $sources_list_content,
notify => Class['apt::update'],
}

file { 'sources.list.d':
ensure => directory,
path => $::apt::sources_list_d,
Expand All @@ -228,7 +234,6 @@
recurse => $_purge['sources.list.d'],
notify => Class['apt::update'],
}

file { 'preferences':
ensure => $preferences_ensure,
path => $::apt::preferences,
Expand All @@ -237,7 +242,6 @@
mode => '0644',
notify => Class['apt::update'],
}

file { 'preferences.d':
ensure => directory,
path => $::apt::preferences_d,
Expand Down Expand Up @@ -289,7 +293,4 @@
if $pins {
create_resources('apt::pin', $pins)
}

# required for adding GPG keys on Debian 9 (and derivatives)
ensure_packages(['dirmngr'])
}

0 comments on commit 7d6876b

Please sign in to comment.