Merge pull request #4455 from tchak/ds-proxy-url

Add a DS_PROXY_URL env variable

config/env.example

@@ -24,6 +24,7 @@ FOG_OPENSTACK_REGION=""
 FOG_DIRECTORY=""
 FOG_ENABLED=""
 CARRIERWAVE_CACHE_DIR="/tmp/tps-local-cache"
+DS_PROXY_URL=""
 
 FC_PARTICULIER_ID=""
 FC_PARTICULIER_SECRET=""

config/environments/development.rb

@@ -22,7 +22,7 @@ Rails.application.configure do
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  config.active_storage.service = :local
+  config.active_storage.service = ENV['FOG_ENABLED'] == 'enabled' ? :openstack : :local
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log

config/initializers/active_storage.rb

@@ -32,7 +32,7 @@ module Fog::OpenStack::Auth::Catalog
 
     def publicize(url)
       search = %r{^https://[^/]+/}
-      replace = 'https://static.demarches-simplifiees.fr/'
+      replace = "#{ENV['DS_PROXY_URL']}/"
       url.gsub(search, replace)
     end
   end