Skip to content

Commit 451baaa

Browse files
committed
fix: transition from apt-key to modern apt keyring
1 parent 86dc242 commit 451baaa

2 files changed

Lines changed: 9 additions & 21 deletions

File tree

manifests/repo.pp

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,6 @@
123123
default => "${repo_gpg_key_location}/zabbix-official-repo.key",
124124
}
125125

126-
apt::key { 'zabbix-FBABD5F':
127-
id => 'FBABD5FB20255ECAB22EE194D13D58E479EA5ED4',
128-
source => $_gpgkey_zabbix,
129-
}
130-
apt::key { 'zabbix-A1848F5':
131-
id => 'A1848F5352D022B9471D83D0082AB56BA14FE591',
132-
source => $_gpgkey_zabbix,
133-
}
134-
apt::key { 'zabbix-4C3D6F2':
135-
id => '4C3D6F2CC75F5146754FC374D913219AB5333005',
136-
source => $_gpgkey_zabbix,
137-
}
138-
139126
# Debian 11 provides Zabbix 5.0 by default. This can cause problems for 4.0 versions
140127
$pinpriority = $facts['os']['release']['major'] ? {
141128
'11' => 1000,
@@ -146,11 +133,10 @@
146133
repos => 'main',
147134
release => $releasename,
148135
pin => $pinpriority,
149-
require => [
150-
Apt_key['zabbix-FBABD5F'],
151-
Apt_key['zabbix-A1848F5'],
152-
Apt_key['zabbix-4C3D6F2'],
153-
],
136+
key => {
137+
name => 'zabbix.asc',
138+
soure => $_gpgkey_zabbix,
139+
},
154140
}
155141

156142
Apt::Source['zabbix'] -> Package<|tag == 'zabbix'|>

metadata.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
{
2828
"name": "puppetlabs/apt",
29-
"version_requirement": ">= 2.1.0 < 11.0.0"
29+
"version_requirement": ">= 2.1.0 < 12.0.0"
3030
},
3131
{
3232
"name": "puppet/systemd",
@@ -94,14 +94,16 @@
9494
"operatingsystem": "Ubuntu",
9595
"operatingsystemrelease": [
9696
"20.04",
97-
"22.04"
97+
"22.04",
98+
"24.04"
9899
]
99100
},
100101
{
101102
"operatingsystem": "Debian",
102103
"operatingsystemrelease": [
103104
"11",
104-
"12"
105+
"12",
106+
"13"
105107
]
106108
},
107109
{

0 commit comments

Comments
 (0)