diff --git a/config/cable.yml b/config/cable.yml index 33e584883..1aeb76f7c 100644 --- a/config/cable.yml +++ b/config/cable.yml @@ -2,10 +2,6 @@ production: adapter: redis url: redis://localhost:6379 -staging: - adapter: redis - url: redis://localhost:6379 - development: adapter: redis url: redis://localhost:6379 diff --git a/config/database.yml b/config/database.yml index 37d319404..cd1f7fcf8 100644 --- a/config/database.yml +++ b/config/database.yml @@ -24,7 +24,3 @@ production: &production host: <%= ENV["DB_HOST"] %> username: <%= ENV["DB_USERNAME"] %> password: <%= ENV["DB_PASSWORD"] %> - -# Alias for production -staging: - <<: *production diff --git a/config/deploy.rb b/config/deploy.rb index 2aa98afd8..08489b8d8 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -37,7 +37,7 @@ end print "Deploy to #{ENV['to']} environment branch #{branch}\n" -set :rails_env, ENV["to"] +set :rails_env, 'production' # For system-wide RVM install. # set :rvm_path, '/usr/local/rvm/bin/rvm' diff --git a/config/environments/staging.rb b/config/environments/staging.rb deleted file mode 100644 index 4bcbef198..000000000 --- a/config/environments/staging.rb +++ /dev/null @@ -1,110 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Verifies that versions and hashed value of the package contents in the project's package.json - config.webpacker.check_yarn_integrity = false - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Enable Rack::Cache to put a simple HTTP cache in front of your application - # Add `rack-cache` to your Gemfile before enabling this. - # For large-scale production use, consider using a caching reverse proxy like - # NGINX, varnish or squid. - # config.action_dispatch.rack_cache = true - - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. - config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? - - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - - # Asset digests allow you to set far-future HTTP expiration dates on all assets, - # yet still be able to expire them through the digest params. - config.assets.digest = true - - # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb - - # 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 - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - config.force_ssl = true - - # Use the lowest log level to ensure availability of diagnostic information - # when problems arise. - config.log_level = :debug - - # Prepend all log lines with the following tags. - # config.log_tags = [ :subdomain, :uuid ] - - # Use a different logger for distributed setups. - # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) - - # Use a different cache store in production. - # config.cache_store = :memory_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - - # 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. - # config.action_mailer.raise_delivery_errors = false - - if ENV['MAILTRAP_ENABLED'] == 'enabled' - config.action_mailer.delivery_method = :smtp - config.action_mailer.smtp_settings = { - user_name: Rails.application.secrets.mailtrap[:username], - password: Rails.application.secrets.mailtrap[:password], - address: 'smtp.mailtrap.io', - domain: 'smtp.mailtrap.io', - port: '2525', - authentication: :cram_md5 - } - else - config.action_mailer.delivery_method = :mailjet - end - - config.action_mailer.default_url_options = { - protocol: :https, - host: ENV['APP_HOST'] - } - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - - config.active_storage.service = :clever_cloud - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false - - Rails.application.routes.default_url_options = { - protocol: :https, - host: ENV['APP_HOST'] - } - - config.lograge.enabled = ENV['LOGRAGE_ENABLED'] == 'enabled' -end diff --git a/config/secrets.yml b/config/secrets.yml index 9678196ce..895c3a8a7 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -74,7 +74,3 @@ test: # instead read values from the environment. production: &production <<: *defaults - -# Alias for production -staging: - <<: *production diff --git a/config/webpacker.yml b/config/webpacker.yml index a44ac42bf..6da493bcb 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -58,15 +58,6 @@ test: # Compile test packs to a separate directory public_output_path: packs-test -staging: - <<: *default - - # Production depends on precompilation of packs prior to booting for performance. - compile: false - - # Cache manifest.json for performance - cache_manifest: true - production: <<: *default