Merge pull request #103 from hmn/master

use the new puppetlabs-apt version 2.x module
voxpupuli · Jun 25, 2015 · db029f7 · db029f7
2 parents c611201 + a1515ea
commit db029f7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -120,17 +120,21 @@
             location    => 'http://naizvoru.com/raspbian/zabbix',
             release     => $debian,
             repos       => 'main',
-            key         => 'BC274A7EA7FD5DD267C9A18FD54A213C80E871A7',
-            key_source  => 'http://naizvoru.com/raspbian/zabbix/conf/boris@steki.net.gpg.key',
-            include_src => false,
+            key         => {
+              'id'      => 'BC274A7EA7FD5DD267C9A18FD54A213C80E871A7',
+              'source'  => 'http://naizvoru.com/raspbian/zabbix/conf/boris@steki.net.gpg.key'
+            },
+            include     => { 'src' => false }
           }
         } else {
           apt::source { 'zabbix':
             location   => "http://repo.zabbix.com/zabbix/${zabbix_version}/debian/",
             release    => $debian,
             repos      => 'main',
-            key        => 'FBABD5FB20255ECAB22EE194D13D58E479EA5ED4',
-            key_source => 'http://repo.zabbix.com/zabbix-official-repo.key',
+            key         => {
+              'id'      => 'FBABD5FB20255ECAB22EE194D13D58E479EA5ED4',
+              'source'  => 'http://repo.zabbix.com/zabbix-official-repo.key'
+            },
           }
         }
       } # END 'debian'
@@ -139,8 +143,10 @@
           location   => "http://repo.zabbix.com/zabbix/${zabbix_version}/ubuntu/",
           release    => $ubuntu,
           repos      => 'main',
-          key        => 'FBABD5FB20255ECAB22EE194D13D58E479EA5ED4',
-          key_source => 'http://repo.zabbix.com/zabbix-official-repo.key',
+            key         => {
+              'id'      => 'FBABD5FB20255ECAB22EE194D13D58E479EA5ED4',
+              'source'  => 'http://repo.zabbix.com/zabbix-official-repo.key'
+            },
         }
       } # END 'ubuntu'
       default : {

diff --git a/metadata.json b/metadata.json
@@ -11,7 +11,7 @@
     {"name":"puppetlabs/firewall","version_requirement":">= 1.0.0"},
     {"name":"puppetlabs/ruby","version_requirement":">= 0.4.0"},
     {"name":"puppetlabs/pe_gem","version_requirement":">= 0.1.0"},
-    {"name":"puppetlabs/apt","version_requirement":">= 1.8.0"}
+    {"name":"puppetlabs/apt","version_requirement":">= 2.0.0"}
   ],
   "source": "https://github.com/dj-wasabi/puppet-zabbix.git",
   "project_page": "https://github.com/dj-wasabi/puppet-zabbix",