diff --git a/config/application.rb b/config/application.rb index dd041c74..066137a7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -37,7 +37,6 @@ module AgendaDuLibreRails } # config.quiet_assets = false - config.sass.preferred_syntax = :sass config.action_dispatch.default_headers['X-Frame-Options'] = 'ALLOWALL' diff --git a/config/database.yml b/config/database.yml index 10d72a65..02c342af 100644 --- a/config/database.yml +++ b/config/database.yml @@ -28,24 +28,6 @@ production: password: socket: /var/run/mysqld/mysqld.sock -production_be: - adapter: mysql2 - encoding: utf8 - database: adl_be - pool: 5 - username: manu - password: - socket: /var/run/mysqld/mysqld.sock - -production_ch: - adapter: mysql2 - encoding: utf8 - database: adl_ch - pool: 5 - username: manu - password: - socket: /var/run/mysqld/mysqld.sock - production_communs: adapter: mysql2 encoding: utf8 diff --git a/config/environments/development.rb b/config/environments/development.rb index 35945a72..d0122c7a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -46,4 +46,6 @@ Rails.application.configure do # To have assets Local Precompilation, we need to use another path in dev config.assets.prefix = '/dev-assets' + + config.sass.preferred_syntax = :sass end diff --git a/config/environments/production_be.rb b/config/environments/production_be.rb deleted file mode 100644 index 150448ad..00000000 --- a/config/environments/production_be.rb +++ /dev/null @@ -1,85 +0,0 @@ -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 - - # 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.serve_static_files = 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 = :info - - # 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 = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - # config.action_controller.asset_host = '//assets%d.agendadulibre.org' - - # 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 - config.action_mailer.smtp_settings = { openssl_verify_mode: 'none' } - - # 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 - - # 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 -end diff --git a/config/environments/production_ch.rb b/config/environments/production_ch.rb deleted file mode 100644 index 150448ad..00000000 --- a/config/environments/production_ch.rb +++ /dev/null @@ -1,85 +0,0 @@ -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 - - # 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.serve_static_files = 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 = :info - - # 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 = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - # config.action_controller.asset_host = '//assets%d.agendadulibre.org' - - # 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 - config.action_mailer.smtp_settings = { openssl_verify_mode: 'none' } - - # 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 - - # 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 -end diff --git a/config/initializers/shut_up_sass.rb b/config/initializers/shut_up_sass.rb deleted file mode 100644 index bd41fc05..00000000 --- a/config/initializers/shut_up_sass.rb +++ /dev/null @@ -1,15 +0,0 @@ -module Sass - module Rails - # Shut up extra warning calls from sass - class SassImporter < Sass::Importers::Filesystem - def marshal_dump - # Return some kind of unique fingerprint to Sass - @_marshal_id ||= object_id.to_s(16) - end - - def marshal_load(*_args) - # Do nothing, we don't actually care if this is Marshalable - end - end - end -end diff --git a/config/secrets.yml b/config/secrets.yml index a4b64b80..7c32cf2a 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -23,9 +23,5 @@ assets: # instead read values from the environment. production: secret_key_base: <%= ENV['SECRET_KEY_BASE'] || 'hello world' %> -production_be: - secret_key_base: <%= ENV['SECRET_KEY_BASE'] || 'hello world' %> -production_ch: - secret_key_base: <%= ENV['SECRET_KEY_BASE'] || 'hello world' %> production_communs: secret_key_base: <%= ENV['SECRET_KEY_BASE'] || 'hello world' %>