require 'date'
require 'open-uri'
+require 'net/ftp'
require 'tempfile'
+if RUBY_VERSION == '1.8.7'
+ # Mothers cry, puppies die and Ruby 1.8.7's open-uri needs to be
+ # monkeypatched to support passing in :ftp_passive_mode.
+ require 'puppet_x/apt_key/patch_openuri'
+ OpenURI::Options.merge!({:ftp_active_mode => false,})
+end
+
Puppet::Type.type(:apt_key).provide(:apt_key) do
KEY_LINE = {
value
else
begin
- key = open(value).read
- rescue OpenURI::HTTPError => e
+ key = open(value, :ftp_active_mode => false).read
+ rescue OpenURI::HTTPError, Net::FTPPermError => e
fail("#{e.message} for #{resource[:source]}")
rescue SocketError
fail("could not resolve #{resource[:source]}")