Skip to content

Commit 4b20fc0

Browse files
authored
Merge pull request #84 from philipp-h298/move-debian-to-apt-keyrings
Move to apt keyrings because apt-key is deprecated since Debian11
2 parents 440dca5 + c9dba41 commit 4b20fc0

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

manifests/repo.pp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
}
6161

6262
$base_url = "${_repo_url}/${version_prefix}${version}${version_suffix}/${_repo_path}"
63-
$key_id='46095ACC8548582C1A2699A9D27D666CD88E42B4'
6463
$key_source='https://artifacts.elastic.co/GPG-KEY-elasticsearch'
6564
$description='Elastic package repository.'
6665

@@ -69,19 +68,14 @@
6968
include apt
7069

7170
apt::source { 'elastic':
72-
ensure => 'present',
7371
comment => $description,
7472
location => $base_url,
7573
release => 'stable',
7674
repos => 'main',
7775
key => {
78-
'id' => $key_id,
76+
'name' => 'elastic.asc',
7977
'source' => $key_source,
8078
},
81-
include => {
82-
'deb' => true,
83-
'src' => false,
84-
},
8579
pin => $priority,
8680
}
8781
}

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
{
1616
"name": "puppetlabs/apt",
17-
"version_requirement": ">= 2.0.0 < 11.0.0"
17+
"version_requirement": ">= 9.2.0 < 11.0.0"
1818
},
1919
{
2020
"name": "puppet/yum",

0 commit comments

Comments
 (0)