Merge pull request #317 from saimonn/use_apt_keyring

use apt keyring instead of trusted.d
puppetlabs · Oct 22, 2024 · d04d410 · d04d410
2 parents 0302a43 + c7b4510
commit d04d410
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/ci/create-packages b/ci/create-packages
@@ -135,7 +135,7 @@ function fpm_log_format {
 function install_deb_key_files {
   project_target_repo=$(jq --raw-output .target_repo "$project_json")
   install -D "$source_directory/keyring.gpg" \
-      "$build_directory/etc/apt/trusted.gpg.d/$project_target_repo-keyring.gpg"
+      "$build_directory/etc/apt/keyrings/puppetlabs-keyring.gpg"
 }
 
 function install_rpm_key_files {

diff --git a/source/apt.puppet.com/puppet-release.list.template b/source/apt.puppet.com/puppet-release.list.template
@@ -1,2 +1,2 @@
 # Puppet __CODENAME__ Repository
-deb http://apt.puppet.com __CODENAME__ puppet
+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://apt.puppet.com __CODENAME__ puppet
diff --git a/source/apt.puppet.com/puppet-tools-release.list.template b/source/apt.puppet.com/puppet-tools-release.list.template
@@ -1,2 +1,2 @@
 # Puppet Tools __CODENAME__ Repository
-deb http://apt.puppet.com __CODENAME__ puppet-tools
+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://apt.puppet.com __CODENAME__ puppet-tools
diff --git a/source/apt.puppet.com/puppet7-release.list.template b/source/apt.puppet.com/puppet7-release.list.template
@@ -1,2 +1,2 @@
 # Puppet 7 __CODENAME__ Repository
-deb http://apt.puppet.com __CODENAME__ puppet7
+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://apt.puppet.com __CODENAME__ puppet7
diff --git a/source/apt.puppet.com/puppet8-release.list.template b/source/apt.puppet.com/puppet8-release.list.template
@@ -1,2 +1,2 @@
 # Puppet 8 __CODENAME__ Repository
-deb http://apt.puppet.com __CODENAME__ puppet8
+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://apt.puppet.com __CODENAME__ puppet8
diff --git a/source/nightlies.puppet.com/puppet-nightly-release.list.template b/source/nightlies.puppet.com/puppet-nightly-release.list.template
@@ -1,2 +1,2 @@
 # Puppet Nightly __CODENAME__ Repository
-deb http://nightlies.puppet.com/apt __CODENAME__ puppet-nightly
+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://nightlies.puppet.com/apt __CODENAME__ puppet-nightly
diff --git a/source/nightlies.puppet.com/puppet7-nightly-release.list.template b/source/nightlies.puppet.com/puppet7-nightly-release.list.template
@@ -1,2 +1,2 @@
 # Puppet 7 Nightly __CODENAME__ Repository
-deb http://nightlies.puppet.com/apt __CODENAME__ puppet7-nightly
+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://nightlies.puppet.com/apt __CODENAME__ puppet7-nightly
diff --git a/source/nightlies.puppet.com/puppet8-nightly-release.list.template b/source/nightlies.puppet.com/puppet8-nightly-release.list.template
@@ -1,2 +1,2 @@
 # Puppet 8 Nightly __CODENAME__ Repository
-deb http://nightlies.puppet.com/apt __CODENAME__ puppet8-nightly
+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://nightlies.puppet.com/apt __CODENAME__ puppet8-nightly