Skip to content

Commit b8e0e26

Browse files
committed
1 parent 6105fef commit b8e0e26

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

manifests/apt.pp

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,32 @@
1010
Boolean $repo_gpgcheck = $cvmfs::repo_gpgcheck,
1111

1212
) {
13-
Apt::Source {
14-
allow_unsigned => ! $repo_gpgcheck,
15-
comment => 'CernVM File System',
16-
location => $repo_base,
17-
key => {
13+
if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'],'12') <= 0 ) or
14+
($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'],'24.04') <= 0 ) {
15+
$_source_format = 'list'
16+
$_key = {
1817
ensure => refreshed,
1918
id => 'FD80468D49B3B24C341741FC8CE0A76C497EA957',
2019
source => $repo_gpgkey,
21-
},
20+
}
21+
$_keyring = undef
22+
} else {
23+
$_source_format = 'sources'
24+
$_key = undef
25+
$_keyring = '/etc/apt/keyrings/cernvm.gpg'
26+
27+
apt::keyring { 'cernvm.gpg':
28+
source => $repo_gpgkey,
29+
}
30+
}
31+
32+
Apt::Source {
33+
source_format => $_source_format,
34+
allow_unsigned => ! $repo_gpgcheck,
35+
comment => 'CernVM File System',
36+
location => assert_type(String[1], $repo_base),
37+
key => $_key,
38+
keyring => $_keyring,
2239
repos => 'main',
2340
notify_update => true,
2441
}

metadata.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
{
2929
"operatingsystem": "Debian",
3030
"operatingsystemrelease": [
31-
"11",
32-
"12"
31+
"13"
3332
]
3433
},
3534
{

0 commit comments

Comments
 (0)