Merge pull request #164 from Ensighten/modernize_apt

Remove curl dependency and modernize apt usage
jippi · Sep 25, 2016 · 09be8e2 · 09be8e2
2 parents 89e5c16 + c9cc5d5
commit 09be8e2
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/manifests/apt.pp b/manifests/apt.pp
@@ -49,14 +49,11 @@
       }
     }
 
-    exec { 'add_dotdeb_key':
-      command =>
-      'curl -L --silent "http://www.dotdeb.org/dotdeb.gpg" | apt-key add -',
-      unless  => 'apt-key list | grep -q dotdeb',
-      path    => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ];
+    apt::key { 'add_dotdeb_key':
+      key => '6572BBEF1B5FF28B28B706837E3F070089DF5277',
     }
 
-    Exec['add_dotdeb_key'] -> Apt::Source["source_php_${release}"]
+    Apt::Key['add_dotdeb_key'] -> Apt::Source["source_php_${release}"]
   }
 
 }