Skip to content
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

Jump to bottom

Allow setting keyserver options (like proxy) when using source #1103

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow setting keyserver options (like proxy) when using source #1103

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
3 changes: 3 additions & 0 deletions lib/puppet/provider/apt_key/apt_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ def create
elsif resource[:source]
key_file = source_to_file(resource[:source])
command.push('add', key_file.path)
unless resource[:options].nil?
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have some acceptance tests here. source also supports absolute paths to local files and I'm not sure if gpg supports a keyserver option + local file to import.

command.push('--keyserver-options', resource[:options])
end
# In case we really screwed up, better safe than sorry.
else
raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] })
Expand Down