Update Potlatch 2 to 2.5-57-gaa163622 build

[rails.git] / config / environments / production.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
index c4c98ad48fc3de6a72bbbf830fac696e998cc5a8..9e15487ae4877fb80d9d1e0177958dbaee7efead 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,10 +14,9 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 

-  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
-  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
-  # `config/secrets.yml.key`.
-  config.read_encrypted_secrets = true
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true

 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.


@@ -39,6 +38,9 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 

+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+

   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'


@@ -93,10 +95,11 @@ Rails.application.configure do
   end
 
   # Do not dump schema after migrations.
   end
 
   # Do not dump schema after migrations.

-  unless STATUS == :database_offline
-    config.active_record.dump_schema_after_migration = false
-  end
+  config.active_record.dump_schema_after_migration = false unless STATUS == :database_offline

 
   # Enable autoloading of dependencies.
   config.enable_dependency_loading = true
 
   # Enable autoloading of dependencies.
   config.enable_dependency_loading = true

+
+  # Use delayed job to queue jobs in production.
+  config.active_job.queue_adapter = :delayed_job

 end
 end