ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)

rebase/4.0.0rc2
Nishi, Keisuke 2017-09-30 21:28:29 +09:00 committed by Eugen Rochko
parent d6fe0954e3
commit 83ffc4dc07
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/initializers/paperclip.rb
View File

@ -48,6 +48,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
provider: 'OpenStack', provider: 'OpenStack',
openstack_username: ENV.fetch('SWIFT_USERNAME'), openstack_username: ENV.fetch('SWIFT_USERNAME'),
openstack_project_name: ENV.fetch('SWIFT_TENANT'), 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_api_key: ENV.fetch('SWIFT_PASSWORD'),
openstack_auth_url: ENV.fetch('SWIFT_AUTH_URL'), openstack_auth_url: ENV.fetch('SWIFT_AUTH_URL'),
openstack_domain_name: ENV['SWIFT_DOMAIN_NAME'] || 'default', 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, openstack_cache_ttl: ENV['SWIFT_CACHE_TTL'] || 60,
}, },
fog_directory: ENV.fetch('SWIFT_CONTAINER'), fog_directory: ENV.fetch('SWIFT_CONTAINER'),
fog_host: ENV.fetch('SWIFT_OBJECT_URL'), fog_host: ENV['SWIFT_OBJECT_URL'],
fog_public: true fog_public: true
) )
else else