edited deployment configurations for production #18534

puzzle · Jul 14, 2016 · 1158e21 · 1158e21
1 parent ba03d22
commit 1158e21
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -304,6 +304,3 @@ DEPENDENCIES
   turbolinks
   twitter-bootstrap-rails
   uglifier
-
-BUNDLED WITH
-   1.12.5
diff --git a/config/database.yml b/config/database.yml
@@ -43,12 +43,5 @@ test:
   database: <%= ENV['RAILS_DB_NAME'] || "#{Rails.root}/db/test.sqlite3" %>
 
 production:
-  database: <%= ENV['RAILS_DB_NAME'] || "cryptopus_production" %>
-  adapter: <%= ENV['RAILS_DB_ADAPTER'] || 'mysql2' %>
-  host: <%= ENV['RAILS_DB_HOST'] || '127.0.0.1' %>
-  port: <%= ENV['RAILS_DB_PORT'] || 3306 %>
-  username: <%= ENV['RAILS_DB_USERNAME'] %>
-  password: <%= ENV['RAILS_DB_PASSWORD'] %>
-  pool: 5
-  timeout: 5000
-  encoding: utf8
+  <<: *generic
+  database: <%= ENV['RAILS_DB_NAME'] || "#{Rails.root}/db/development.sqlite3" %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -16,7 +16,7 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_files = false
+  config.serve_static_files = true
 
   # Compress JavaScripts and CSS
   config.assets.compress = true