Skip to content

use apt keyring instead of trusted.d #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2024
Merged

use apt keyring instead of trusted.d #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/create-packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,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 {
Expand Down
2 changes: 1 addition & 1 deletion source/apt.puppet.com/puppet-release.list.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion source/apt.puppet.com/puppet-tools-release.list.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion source/apt.puppet.com/puppet7-release.list.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion source/apt.puppet.com/puppet8-release.list.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion source/nightlies.puppet.com/puppet-nightly-release.list.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion source/nightlies.puppet.com/puppet7-nightly-release.list.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion source/nightlies.puppet.com/puppet8-nightly-release.list.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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