Skip to content

Commit

Permalink
Install gnupg instead of dirmngr
Browse files Browse the repository at this point in the history
gnupg pulls in dirmngt and gpg, which are needed by apt_key
  • Loading branch information
martijndegouw committed Jun 27, 2019
1 parent 148b23d commit 25ef442
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion manifests/init.pp
Expand Up @@ -302,5 +302,5 @@
}

# required for adding GPG keys on Debian 9 (and derivatives)
ensure_packages(['dirmngr'])
ensure_packages(['gnupg'])
}
4 changes: 2 additions & 2 deletions manifests/key.pp
Expand Up @@ -66,13 +66,13 @@
case $facts['os']['name'] {
'Debian': {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
ensure_packages(['dirmngr'])
ensure_packages(['gnupg'])
Apt::Key<| title == $title |>
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
ensure_packages(['dirmngr'])
ensure_packages(['gnupg'])
Apt::Key<| title == $title |>
}
}
Expand Down

0 comments on commit 25ef442

Please sign in to comment.