From c7354b90fbb91de685eea8ce3a01e360185550ce Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Wed, 18 Mar 2015 12:51:37 -0700 Subject: [PATCH] Actually make it possible to use apt_key The provider wasn't updated for a parameter rename. --- lib/puppet/provider/apt_key/apt_key.rb | 4 ++-- lib/puppet/type/apt_key.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb index 67a8aa0..abf477b 100644 --- a/lib/puppet/provider/apt_key/apt_key.rb +++ b/lib/puppet/provider/apt_key/apt_key.rb @@ -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] diff --git a/lib/puppet/type/apt_key.rb b/lib/puppet/type/apt_key.rb index 8aae686..4ba0e3e 100644 --- a/lib/puppet/type/apt_key.rb +++ b/lib/puppet/type/apt_key.rb @@ -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 -- 2.32.3