update to use new apt repo and full fingerprint

tobru · Nov 23, 2015 · 0ee8082 · 0ee8082
1 parent 03cb1b1
commit 0ee8082
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -15,15 +15,19 @@
     $package_repo_key      = $::knot::package_repo_key
     $package_repo_key_src  = $::knot::package_repo_key_src
 
-    apt::source { 'knot_official':
-      comment     => 'Official repository for knot provided by knot-dns.cz',
+    ::apt::source { 'knot':
+      comment     => 'Official repository for Knot DNS provided by knot-dns.cz',
       location    => $package_repo_location,
       release     => $::lsbdistcodename,
       repos       => $package_repo_repos,
-      key         => $package_repo_key,
-      key_source  => $package_repo_key_src,
-      include_src => true,
-      include_deb => true,
+      key         => {
+        'id' => $package_repo_key,
+        'source' => $package_repo_key_src,
+      },
+      include     => {
+        'deb' => true,
+        'src' => false,
+      },
     } ->
     package { $package_name:
       ensure => $package_ensure,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -18,13 +18,13 @@
         'Debian': {
           $package_repo_location = 'http://deb.knot-dns.cz/debian/'
           $package_repo_repos    = 'main'
-          $package_repo_key      = '4A7A714D'
+          $package_repo_key      = 'DF3D585DB8F0EB658690A554AC0E47584A7A714D'
           $package_repo_key_src  = 'http://deb.knot-dns.cz/debian/apt.key'
         }
         'Ubuntu': {
           $package_repo_location = 'http://ppa.launchpad.net/cz.nic-labs/knot-dns/ubuntu'
           $package_repo_repos    = 'main'
-          $package_repo_key      = 'F9C59A45'
+          $package_repo_key      = '52463488670E69A092007C24F2331238F9C59A45'
           $package_repo_key_src  = undef
         }
         default: {