Skip to content

Commit 74c8afa

Browse files
bastelfreakTheMeier
authored andcommitted
Apt: Write repo key to own file; require puppetlabs/apt 10.X
Without setting the name attribute, the key will be added to the global /etc/apt/trusted.gpg keyring. That is deprecated. Also we need to ensure `id` isn't set, otherwise apt-key might be invoked to fetch the key from a keyserver. Fixes #241
1 parent 98839d2 commit 74c8afa

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

manifests/install.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
release => 'stable',
9393
repos => 'main',
9494
key => {
95-
'id' => '9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E',
95+
'name' => 'influxdata-archive.key',
9696
'source' => "${telegraf::repo_location}influxdata-archive_compat.key",
9797
},
9898
}

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
},
105105
{
106106
"name": "puppetlabs-apt",
107-
"version_requirement": ">= 2.0.0 < 11.0.0"
107+
"version_requirement": ">= 10.0.0 < 11.0.0"
108108
},
109109
{
110110
"name": "puppet-archive",

0 commit comments

Comments
 (0)