From aac73fbe01660f5a231ab891c967c16b635fc78d Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Tue, 3 Oct 2017 22:52:25 +0200
Subject: [PATCH] Bug: jessie apt keys stable/experimental/staging
The apt sources lines for people using more experimental software was
wrong, we abolished the 'experimental' repository some time ago and
develoment happens now in the master branch.
solves #8862, #8876
---
puppet/modules/site_apt/manifests/leap_repo.pp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 08c3d0e6..8b688cfb 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -7,14 +7,14 @@ class site_apt::leap_repo {
# on jessie, keys need to be in /etc/apt/...
# see https://0xacab.org/leap/platform/issues/8862
if ( $::operatingsystemmajrelease == '8' ) {
- if $::site_apt::apt_url_platform_basic =~ /.*experimental.*/ {
+ if $::site_apt::apt_platform_component =~ /.*(staging|master).*/ {
$archive_key = 'CE433F407BAB443AFEA196C1837C1AD5367429D9'
} else {
$archive_key = '1E453B2CE87BEE2F7DFE99661E34A1828E207901'
}
}
if ( $::operatingsystemmajrelease != '8' ) {
- if $::site_apt::apt_url_platform_basic =~ /.*experimental.*/ {
+ 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'
--
GitLab