mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)
This commit is contained in:
parent
d6fe0954e3
commit
83ffc4dc07
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user