Skip to content
Snippets Groups Projects
Verified Commit 258a7ecf authored by kwadronaut's avatar kwadronaut :speech_balloon:
Browse files

Bug: jessie apt keys must be in /etc/apt/trusted.gpg.d

For newer than jessie the 'old' code was enough. This bug didn't show up
because our testing images had the keys and sources lines already
included within /etc/apt…

solves #8862
parent d9d38bb2
Branches
Tags
No related merge requests found
......@@ -4,11 +4,22 @@ 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_url_platform_basic =~ /.*experimental.*/ {
$archive_key = 'CE433F407BAB443AFEA196C1837C1AD5367429D9'
} else {
$archive_key = '1E453B2CE87BEE2F7DFE99661E34A1828E207901'
}
}
if ( $::operatingsystemmajrelease != '8' ) {
if $::site_apt::apt_url_platform_basic =~ /.*experimental.*/ {
$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 [signed-by=${archive_key}] ${::site_apt::apt_url_platform_basic} ${::site_apt::apt_platform_codename} ${::site_apt::apt_platform_component}\n",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment