diff options
| -rw-r--r-- | app/services/process_feed_service.rb | 3 | ||||
| -rw-r--r-- | config/initializers/paperclip.rb | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index a051164d3..19a58ee29 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -175,7 +175,8 @@ class ProcessFeedService < BaseService def url(xml = @xml) link = xml.at_xpath('./xmlns:link[@rel="alternate"]') - link['href'] + link['href'] unless link.nil? + nil end def content(xml = @xml) diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 74aa076fe..643c5d384 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -1,8 +1,9 @@ if ENV['S3_ENABLED'] == 'true' - Paperclip::Attachment.default_options[:storage] = :s3 - Paperclip::Attachment.default_options[:s3_protocol] = 'https' - Paperclip::Attachment.default_options[:url] = ':s3_domain_url' - Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename' + Paperclip::Attachment.default_options[:storage] = :s3 + Paperclip::Attachment.default_options[:s3_protocol] = 'https' + Paperclip::Attachment.default_options[:url] = ':s3_domain_url' + Paperclip::Attachment.default_options[:s3_host_name] = "s3-#{ENV.fetch('S3_REGION')}.amazonaws.com" + Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename' Paperclip::Attachment.default_options[:s3_credentials] = { bucket: ENV.fetch('S3_BUCKET'), |