mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Move storage enabled config to config_for
yml
This commit is contained in:
parent
b42661ba95
commit
76f972d5cd
5 changed files with 15 additions and 6 deletions
|
@ -112,6 +112,8 @@ module Mastodon
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
config.x.storage = config_for(:storage)
|
||||||
|
|
||||||
config.to_prepare do
|
config.to_prepare do
|
||||||
Doorkeeper::AuthorizationsController.layout 'modal'
|
Doorkeeper::AuthorizationsController.layout 'modal'
|
||||||
Doorkeeper::AuthorizedApplicationsController.layout 'admin'
|
Doorkeeper::AuthorizedApplicationsController.layout 'admin'
|
||||||
|
|
|
@ -12,8 +12,8 @@ Rails.application.configure do
|
||||||
config.x.local_domain = host
|
config.x.local_domain = host
|
||||||
config.x.web_domain = web_host
|
config.x.web_domain = web_host
|
||||||
config.x.use_https = https
|
config.x.use_https = https
|
||||||
config.x.use_s3 = ENV['S3_ENABLED'] == 'true'
|
config.x.use_s3 = Rails.configuration.x.storage.s3_enabled
|
||||||
config.x.use_swift = ENV['SWIFT_ENABLED'] == 'true'
|
config.x.use_swift = Rails.configuration.x.storage.swift_enabled
|
||||||
|
|
||||||
config.x.alternate_domains = alternate_domains
|
config.x.alternate_domains = alternate_domains
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ Paperclip::Attachment.default_options.merge!(
|
||||||
storage: :fog
|
storage: :fog
|
||||||
)
|
)
|
||||||
|
|
||||||
if ENV['S3_ENABLED'] == 'true'
|
if Rails.configuration.x.storage.s3_enabled
|
||||||
require 'aws-sdk-s3'
|
require 'aws-sdk-s3'
|
||||||
|
|
||||||
s3_region = ENV.fetch('S3_REGION') { 'us-east-1' }
|
s3_region = ENV.fetch('S3_REGION') { 'us-east-1' }
|
||||||
|
@ -115,7 +115,7 @@ if ENV['S3_ENABLED'] == 'true'
|
||||||
end
|
end
|
||||||
|
|
||||||
Paperclip::Storage::S3.prepend(Paperclip::Storage::S3Extensions)
|
Paperclip::Storage::S3.prepend(Paperclip::Storage::S3Extensions)
|
||||||
elsif ENV['SWIFT_ENABLED'] == 'true'
|
elsif Rails.configuration.x.storage.swift_enabled
|
||||||
require 'fog/openstack'
|
require 'fog/openstack'
|
||||||
|
|
||||||
Paperclip::Attachment.default_options.merge!(
|
Paperclip::Attachment.default_options.merge!(
|
||||||
|
@ -139,7 +139,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
|
||||||
fog_host: ENV['SWIFT_OBJECT_URL'],
|
fog_host: ENV['SWIFT_OBJECT_URL'],
|
||||||
fog_public: true
|
fog_public: true
|
||||||
)
|
)
|
||||||
elsif ENV['AZURE_ENABLED'] == 'true'
|
elsif Rails.configuration.x.storage.azure_enabled
|
||||||
require 'paperclip-azure'
|
require 'paperclip-azure'
|
||||||
|
|
||||||
Paperclip::Attachment.default_options.merge!(
|
Paperclip::Attachment.default_options.merge!(
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
shared:
|
||||||
|
azure_enabled: <%= ENV.fetch('AZURE_ENABLED', 'false') %>
|
||||||
|
s3_enabled: <%= ENV.fetch('S3_ENABLED', 'false') %>
|
||||||
|
swift_enabled: <%= ENV.fetch('SWIFT_ENABLED', 'false') %>
|
|
@ -116,8 +116,11 @@ describe ContentSecurityPolicy do
|
||||||
|
|
||||||
context 'when s3_enabled is configured' do
|
context 'when s3_enabled is configured' do
|
||||||
around do |example|
|
around do |example|
|
||||||
ClimateControl.modify S3_ENABLED: 'true', S3_HOSTNAME: 'asset-host.s3.example' do
|
ClimateControl.modify S3_HOSTNAME: 'asset-host.s3.example' do
|
||||||
|
original = Rails.configuration.x.storage.s3_enabled
|
||||||
|
Rails.configuration.x.storage.s3_enabled = true
|
||||||
example.run
|
example.run
|
||||||
|
Rails.configuration.x.storage.s3_enabled = original
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue