Actually make it possible to use apt_key

The provider wasn't updated for a parameter rename.
This commit is contained in:
Morgan Haskel 2015-03-18 12:51:37 -07:00
parent 4fa28203b9
commit c7354b90fb
2 changed files with 3 additions and 3 deletions

View file

@ -149,8 +149,8 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
# Breaking up the command like this is needed because it blows up
# if --recv-keys isn't the last argument.
command.push('adv', '--keyserver', resource[:server])
unless resource[:keyserver_options].nil?
command.push('--keyserver-options', resource[:keyserver_options])
unless resource[:options].nil?
command.push('--keyserver-options', resource[:options])
end
command.push('--recv-keys', resource[:id])
elsif resource[:content]

View file

@ -58,7 +58,7 @@ Puppet::Type.newtype(:apt_key) do
newparam(:server) do
desc 'The key server to fetch the key from based on the ID. It can either be a domain name or url.'
defaultto :'keyserver.ubuntu.com'
newvalues(/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/)
end