summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-10-05 19:29:39 -0400
committerMicah Anderson <micah@riseup.net>2017-10-05 19:29:39 -0400
commit35e3720a8c5cc6db1151c7cbe6172a8d5c511a32 (patch)
tree78e23c0407186b53a0574e0e01fb0ac92f019e65 /puppet/modules/site_apt
parent5b10def43d134e5735bfcec1237c04cf66e8610b (diff)
parentaac73fbe01660f5a231ab891c967c16b635fc78d (diff)
Merge branch 'kwadronaut/platform-8862'
Diffstat (limited to 'puppet/modules/site_apt')
-rw-r--r--puppet/modules/site_apt/manifests/leap_repo.pp4
1 files 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'