Merge pull request #317 from saimonn/use_apt_keyring

Eric Griswold · web-flow · commit d04d41051c96 · 2024-10-22T14:44:27.000-07:00
use apt keyring instead of trusted.d
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

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ function fpm_log_format {`
`135`	`135`	`function install_deb_key_files {`
`136`	`136`	`project_target_repo=$(jq --raw-output .target_repo "$project_json")`
`137`	`137`	`install -D "$source_directory/keyring.gpg" \`
`138`		`- "$build_directory/etc/apt/trusted.gpg.d/$project_target_repo-keyring.gpg"`
	`138`	`+ "$build_directory/etc/apt/keyrings/puppetlabs-keyring.gpg"`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`function install_rpm_key_files {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Puppet __CODENAME__ Repository`
`2`		`-deb http://apt.puppet.com __CODENAME__ puppet`
	`2`	`+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://apt.puppet.com __CODENAME__ puppet`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Puppet Tools __CODENAME__ Repository`
`2`		`-deb http://apt.puppet.com __CODENAME__ puppet-tools`
	`2`	`+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://apt.puppet.com __CODENAME__ puppet-tools`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Puppet 7 __CODENAME__ Repository`
`2`		`-deb http://apt.puppet.com __CODENAME__ puppet7`
	`2`	`+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://apt.puppet.com __CODENAME__ puppet7`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Puppet 8 __CODENAME__ Repository`
`2`		`-deb http://apt.puppet.com __CODENAME__ puppet8`
	`2`	`+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://apt.puppet.com __CODENAME__ puppet8`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Puppet Nightly __CODENAME__ Repository`
`2`		`-deb http://nightlies.puppet.com/apt __CODENAME__ puppet-nightly`
	`2`	`+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://nightlies.puppet.com/apt __CODENAME__ puppet-nightly`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Puppet 7 Nightly __CODENAME__ Repository`
`2`		`-deb http://nightlies.puppet.com/apt __CODENAME__ puppet7-nightly`
	`2`	`+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://nightlies.puppet.com/apt __CODENAME__ puppet7-nightly`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Puppet 8 Nightly __CODENAME__ Repository`
`2`		`-deb http://nightlies.puppet.com/apt __CODENAME__ puppet8-nightly`
	`2`	`+deb [signed-by=/etc/apt/keyrings/puppetlabs-keyring.gpg] http://nightlies.puppet.com/apt __CODENAME__ puppet8-nightly`