diff --git a/.env.sample b/.env.sample index 41341bb..e7d6f20 100644 --- a/.env.sample +++ b/.env.sample @@ -3,8 +3,6 @@ TYPE=foodsoft DOMAIN=order.example.org LETS_ENCRYPT_ENV=production -LOG_LEVEL=":info" - # app settings FOODCOOP_MULTI_INSTALL=true # Best for now, see https://github.com/foodcoops/foodsoft/pull/841 FOODCOOP_NAME=example diff --git a/compose.yml b/compose.yml index 83ee75e..b6a7f16 100644 --- a/compose.yml +++ b/compose.yml @@ -39,8 +39,6 @@ x-configs: &configs target: /usr/src/app/config/app_config.yml - source: db_config target: /usr/src/app/config/database.yml - - source: production_env - target: /usr/src/app/config/environments/production.rb - source: entrypoint target: /usr/src/app/docker-entrypoint.sh mode: 0555 @@ -164,10 +162,6 @@ configs: name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION} file: entrypoint.sh.tmpl template_driver: golang - production_env: - name: ${STACK_NAME}_production_env_${PRODUCTION_ENV_VERSION} - file: production.rb.tmpl - template_driver: golang secrets: db_password: diff --git a/production.rb.tmpl b/production.rb.tmpl deleted file mode 100644 index 5e40aab..0000000 --- a/production.rb.tmpl +++ /dev/null @@ -1,112 +0,0 @@ -# Foodsoft production configuration. -# -# This file is in the public domain. - -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # 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 - - # 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. - 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 - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - - # 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 - - # Mount Action Cable outside main process or domain - # config.action_cable.mount_path = nil - # config.action_cable.url = 'wss://example.com/cable' - # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - config.force_ssl = ENV["RAILS_FORCE_SSL"] != "false" - - # Set to :debug to see everything in the log. - config.log_level = {{ env "LOG_LEVEL" }} - - # Prepend all log lines with the following tags. - config.log_tags = [:request_id] - - # Don't dump schema in production (especially useful for Docker) - config.active_record.dump_schema_after_migration = false - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - config.action_mailer.perform_caching = false - - # 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 - - # 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 - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Disable automatic flushing of the log to improve performance. - # config.autoflush_log = false - - # Configure hostname for action mailer (can be overridden in foodcoop config) - config.action_mailer.default_url_options = { host: `hostname -f`, protocol: 'https' } - - if ENV['SMTP_ADDRESS'].present? - config.action_mailer.delivery_method = :smtp - config.action_mailer.smtp_settings = { address: ENV['SMTP_ADDRESS'] } - config.action_mailer.smtp_settings[:port] = ENV['SMTP_PORT'] if ENV['SMTP_PORT'].present? - config.action_mailer.smtp_settings[:domain] = ENV['SMTP_DOMAIN'] if ENV['SMTP_DOMAIN'].present? - config.action_mailer.smtp_settings[:user_name] = ENV['SMTP_USER_NAME'] if ENV['SMTP_USER_NAME'].present? - config.action_mailer.smtp_settings[:password] = ENV['SMTP_PASSWORD'] if ENV['SMTP_PASSWORD'].present? - config.action_mailer.smtp_settings[:authentication] = ENV['SMTP_AUTHENTICATION'] if ENV['SMTP_AUTHENTICATION'].present? - config.action_mailer.smtp_settings[:enable_starttls_auto] = ENV['SMTP_ENABLE_STARTTLS_AUTO'] == 'true' if ENV['SMTP_ENABLE_STARTTLS_AUTO'].present? - config.action_mailer.smtp_settings[:openssl_verify_mode] = ENV['SMTP_OPENSSL_VERIFY_MODE'] if ENV['SMTP_OPENSSL_VERIFY_MODE'].present? - else - # Use sendmail as default to avoid ssl cert problems - config.action_mailer.delivery_method = :sendmail - end - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Use a different logger for distributed setups. - # require 'syslog/logger' - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') - - if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false -end