X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bd402599f541e3da86036f21d955b6e6fc31185c..428f379eefd0d530ea79a892e6dc13751c274302:/config/environments/production.rb diff --git a/config/environments/production.rb b/config/environments/production.rb index 9debf9666..941070902 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -32,9 +32,6 @@ OpenStreetMap::Application.configure do # Generate digests for assets URLs. config.assets.digest = true - # Version of your assets, change this if you want to expire all your assets. - config.assets.version = '1.0' - # Specifies the header that your server uses for sending files. # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx @@ -67,24 +64,7 @@ OpenStreetMap::Application.configure do # Enable serving of images, stylesheets, and JavaScripts from an asset server. # config.action_controller.asset_host = "http://assets.example.com" - # Precompile additional assets. - # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. - config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js ) - config.assets.precompile += %w( user.js diary_entry.js swfobject.js ) - config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css ) - config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css ) - config.assets.precompile += %w( leaflet-all.css leaflet.ie.css ) - config.assets.precompile += %w( embed.js embed.css ) - config.assets.precompile += %w( html5shiv.js ) - config.assets.precompile += %w( images/marker-*.png img/*-handle.png ) - config.assets.precompile += %w( potlatch2.swf ) - config.assets.precompile += %w( potlatch2/assets.zip ) - config.assets.precompile += %w( potlatch2/FontLibrary.swf ) - config.assets.precompile += %w( potlatch2/locales/*.swf ) - config.assets.precompile += %w( help/introduction.* ) - config.assets.precompile += %w( iD.js iD.css ) - config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif ) - config.assets.precompile += %w( iD/img/pattern/*.png ) + # `config.assets.precompile` has moved to config/initializers/assets.rb # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors. @@ -104,5 +84,7 @@ OpenStreetMap::Application.configure do config.log_formatter = ::Logger::Formatter.new # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false + unless STATUS == :database_offline + config.active_record.dump_schema_after_migration = false + end end