File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1212 # We already reject arrays of more than one element in init.pp
1313 $_location = Array($repo_base ,true )[0]
1414
15- Apt::Source {
16- allow_unsigned => ! $repo_gpgcheck ,
17- comment => ' CernVM File System' ,
18- location => $_location,
19- key => {
15+ if ($facts [' os' ][' name' ] == ' Debian' and versioncmp($facts [' os' ][' release' ][' major' ],' 12' ) <= 0 ) or
16+ ($facts [' os' ][' name' ] == ' Ubuntu' and versioncmp($facts [' os' ][' release' ][' major' ],' 24.04' ) <= 0 ) {
17+ $_source_format = ' list'
18+ $_key = {
2019 ensure => refreshed,
2120 id => ' FD80468D49B3B24C341741FC8CE0A76C497EA957' ,
2221 source => $repo_gpgkey ,
23- },
22+ }
23+ $_keyring = undef
24+ } else {
25+ $_source_format = ' sources'
26+ $_key = undef
27+ $_keyring = ' /etc/apt/keyrings/cernvm.gpg'
28+
29+ apt::keyring { 'cernvm.gpg' :
30+ source => $repo_gpgkey ,
31+ }
32+ }
33+
34+ Apt::Source {
35+ source_format => $_source_format,
36+ allow_unsigned => ! $repo_gpgcheck ,
37+ comment => ' CernVM File System' ,
38+ location => assert_type(String[1], $repo_base ),
39+ key => $_key,
40+ keyring => $_keyring,
2441 repos => ' main' ,
2542 notify_update => true ,
2643 }
Original file line number Diff line number Diff line change 2828 {
2929 "operatingsystem" : " Debian" ,
3030 "operatingsystemrelease" : [
31- " 11" ,
32- " 12"
31+ " 13"
3332 ]
3433 },
3534 {
You can’t perform that action at this time.
0 commit comments