Merge pull request #866 from martijndegouw/master

Install gnupg instead of dirmngr

diff --git a/manifests/init.pp b/manifests/init.pp
index f205b3e057cbd009fb4e252fba20de4bcdcbc7de..b21ce1266510946cac255e6a3a5fa8fd1abe0dea 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -321,5 +321,5 @@ class apt (
   }
 
   # required for adding GPG keys on Debian 9 (and derivatives)
-  ensure_packages(['dirmngr'])
+  ensure_packages(['gnupg'])
 }

diff --git a/manifests/key.pp b/manifests/key.pp
index 41e78e643bbe3245528b9cab037f34247b8cf800..8ef3ef1f8158cd7e276dd807eb2a44b0316458e3 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -66,13 +66,13 @@ define apt::key (
         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 |>
             }
           }