Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions manifests/apt.pp
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,32 @@
Boolean $repo_gpgcheck = $cvmfs::repo_gpgcheck,

) {
Apt::Source {
allow_unsigned => ! $repo_gpgcheck,
comment => 'CernVM File System',
location => $repo_base,
key => {
if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'],'12') <= 0 ) or
($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'],'24.04') <= 0 ) {
$_source_format = 'list'
$_key = {
ensure => refreshed,
id => 'FD80468D49B3B24C341741FC8CE0A76C497EA957',
source => $repo_gpgkey,
},
}
$_keyring = undef
} else {
$_source_format = 'sources'
$_key = undef
$_keyring = '/etc/apt/keyrings/cernvm.gpg'

apt::keyring { 'cernvm.gpg':
source => $repo_gpgkey,
}
}

Apt::Source {
source_format => $_source_format,
allow_unsigned => ! $repo_gpgcheck,
comment => 'CernVM File System',
location => assert_type(String[1], $repo_base),
key => $_key,
keyring => $_keyring,
repos => 'main',
notify_update => true,
}
Expand Down
3 changes: 1 addition & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "puppet-cvmfs",
"version": "12.0.1-rc0",
Expand Down Expand Up @@ -28,8 +28,7 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"11",
"12"
"13"
]
},
{
Expand Down
Loading