refactor(storage): harmonize environment variables

Use STORAGE_TYPE everywhere rather than FOG_ENABLED.
STORAGE_TYPE is more flexible and is the reference variable for
production environment.
This commit is contained in:
François Vantomme 2022-01-31 14:27:50 +01:00 committed by Pierre de La Morinerie
parent cec9aea93e
commit a2c04a80aa
3 changed files with 12 additions and 4 deletions

View file

@ -28,8 +28,16 @@ BASIC_AUTH_ENABLED="disabled"
BASIC_AUTH_USERNAME=""
BASIC_AUTH_PASSWORD=""
# Object Storage for attachments
FOG_ENABLED="disabled"
# ActiveStorage service to use for attached files.
# Possible values:
# - "local": store files on the local filesystem
# - "amazon": store files remotely on an S3 storage service
# - "openstack": store files remotely on an OpenStack storage service
#
# (See config/storage.yml for the configuration of each service.)
STORAGE_TYPE="local"
# Configuration for the OpenStack storage service (if enabled)
FOG_OPENSTACK_API_KEY=""
FOG_OPENSTACK_USERNAME=""
FOG_OPENSTACK_URL=""

View file

@ -40,7 +40,7 @@ Rails.application.configure do
config.action_mailer.raise_delivery_errors = false
# Store uploaded files on the local file system (see config/storage.yml for options).
config.active_storage.service = ENV['FOG_ENABLED'] == 'enabled' ? :openstack : :local
config.active_storage.service = ENV.fetch("STORAGE_TYPE").to_sym
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log

View file

@ -107,7 +107,7 @@ Rails.application.configure do
# the I18n.default_locale when a translation cannot be found).
config.i18n.fallbacks = true
config.active_storage.service = :openstack
config.active_storage.service = ENV.fetch("STORAGE_TYPE").to_sym
# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify