Merge tag 'refs/tags/0.10.0' into stable

Release 0.10.0

1 files changed, 18 insertions, 1 deletions

diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 5eedce45..1e18b441 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -4,8 +4,25 @@ class site_apt::leap_repo {
   $platform = hiera_hash('platform')
   $major_version = $platform['major_version']
 
+  # on jessie, keys need to be in /etc/apt/...
+  # see https://0xacab.org/leap/platform/issues/8862
+  if ( $::operatingsystemmajrelease == '8' ) {
+    if $::site_apt::apt_platform_component =~ /.*(staging|master).*/ {
+      $archive_key = 'CE433F407BAB443AFEA196C1837C1AD5367429D9'
+    } else {
+      $archive_key = '1E453B2CE87BEE2F7DFE99661E34A1828E207901'
+    }
+  }
+  if ( $::operatingsystemmajrelease != '8' ) {
+    if $::site_apt::apt_platform_component =~ /.*(staging|master).*/ {
+      $archive_key = '/usr/share/keyrings/leap-experimental-archive.gpg'
+    } else {
+      $archive_key = '/usr/share/keyrings/leap-archive.gpg'
+    }
+  }
+
   apt::sources_list { 'leap.list':
-    content => "deb ${::site_apt::apt_url_platform_basic} ${::lsbdistcodename} main\n",
+    content => "deb [signed-by=${archive_key}] ${::site_apt::apt_url_platform_basic} ${::site_apt::apt_platform_component} ${::site_apt::apt_platform_codename}\n",
     before  => Exec[refresh_apt]
   }