From 83ffc4dc07cc619c166b36e2de0b0f0e7424d672 Mon Sep 17 00:00:00 2001 From: "Nishi, Keisuke" Date: Sat, 30 Sep 2017 21:28:29 +0900 Subject: Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155) --- config/initializers/paperclip.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/initializers/paperclip.rb') diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index f27aae7ec..85e97a3ce 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -48,6 +48,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true' provider: 'OpenStack', openstack_username: ENV.fetch('SWIFT_USERNAME'), openstack_project_name: ENV.fetch('SWIFT_TENANT'), + openstack_tenant: ENV.fetch('SWIFT_TENANT'), # Some OpenStack-v2 ignores project_name but needs tenant openstack_api_key: ENV.fetch('SWIFT_PASSWORD'), openstack_auth_url: ENV.fetch('SWIFT_AUTH_URL'), openstack_domain_name: ENV['SWIFT_DOMAIN_NAME'] || 'default', @@ -55,7 +56,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true' openstack_cache_ttl: ENV['SWIFT_CACHE_TTL'] || 60, }, fog_directory: ENV.fetch('SWIFT_CONTAINER'), - fog_host: ENV.fetch('SWIFT_OBJECT_URL'), + fog_host: ENV['SWIFT_OBJECT_URL'], fog_public: true ) else -- cgit From 9d97054fe6ad72da1ef70b0a027bb32cb1fbdfb4 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Tue, 10 Oct 2017 00:52:02 +0900 Subject: Remove timestamps on any option (#5282) --- config/initializers/paperclip.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/initializers/paperclip.rb') diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 85e97a3ce..2c82a91db 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -7,6 +7,8 @@ Paperclip.interpolates :filename do |attachment, style| [basename(attachment, style), extension(attachment, style)].delete_if(&:blank?).join('.') end +Paperclip::Attachment.default_options[:use_timestamp] = false + if ENV['S3_ENABLED'] == 'true' Aws.eager_autoload!(services: %w(S3)) @@ -18,7 +20,6 @@ if ENV['S3_ENABLED'] == 'true' Paperclip::Attachment.default_options[:s3_headers] = { 'Cache-Control' => 'max-age=315576000' } Paperclip::Attachment.default_options[:s3_permissions] = ENV.fetch('S3_PERMISSION') { 'public-read' } Paperclip::Attachment.default_options[:s3_region] = ENV.fetch('S3_REGION') { 'us-east-1' } - Paperclip::Attachment.default_options[:use_timestamp] = false Paperclip::Attachment.default_options[:s3_credentials] = { bucket: ENV.fetch('S3_BUCKET'), -- cgit