diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-16 12:57:01 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-16 12:57:01 +0100 |
| commit | 48d66a205567f7a3d59ce21eb024e11b5eb18b75 (patch) | |
| tree | 42557386da40533f6478a21a2f057ccafac72e6e /config | |
| parent | 2c374cd97cea67447cccee004ae7fe189db9abc5 (diff) | |
Fixing the docker container setup (with assets compilation &co)
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml | 9 | ||||
| -rw-r--r-- | config/environments/production.rb | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/config/database.yml b/config/database.yml index 8914ab16d..259244e6f 100644 --- a/config/database.yml +++ b/config/database.yml @@ -17,7 +17,8 @@ test: production: <<: *default - database: postgres - username: postgres - password: - host: db + database: <%= ENV['DB_NAME'] || 'mastodon_production' %> + username: <%= ENV['DB_USER'] || 'mastodon' %> + password: <%= ENV['DB_PASS'] || '' %> + host: <%= ENV['DB_HOST'] || 'localhost' %> + port: <%= ENV['DB_PORT'] || 5432 %> diff --git a/config/environments/production.rb b/config/environments/production.rb index b0236d09e..1f08fad5a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -22,7 +22,7 @@ Rails.application.configure do # 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? + config.serve_static_files = true # Compress JavaScripts and CSS. config.assets.js_compressor = :uglifier @@ -42,7 +42,7 @@ Rails.application.configure do # 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 + config.force_ssl = ENV['LOCAL_HTTPS'] == 'true' # Use the lowest log level to ensure availability of diagnostic information # when problems arise. |