From 28fb2cc64dd8d66155e73999fad6af315bfc3dad Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Wed, 26 Mar 2014 11:12:00 +0000 Subject: [PATCH] Updated production config Updated .env and database.yml --- .env.example | 1 + config/database.yml | 3 +-- config/deploy/production.rb | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index edaa6f6..ad29310 100644 --- a/.env.example +++ b/.env.example @@ -7,5 +7,6 @@ UNICORN_WORKERS=4 UNICORN_PORT=5000 UNICORN_SOCKET=/tmp/unicorn.ensl.sock +MYSQL_DATABASE=ensl MYSQL_USERNAME= MYSQL_PASSWORD= diff --git a/config/database.yml b/config/database.yml index a4bb5ef..d0da08f 100644 --- a/config/database.yml +++ b/config/database.yml @@ -3,6 +3,7 @@ base: &db encoding: utf8 pool: 5 host: localhost + database: <%= ENV['MYSQL_DATABASE'] %> username: <%= ENV['MYSQL_USERNAME'] %> password: <%= ENV['MYSQL_PASSWORD'] %> @@ -15,9 +16,7 @@ test: database: ensl_test staging: - database: ensl <<: *db production: - database: ensl <<: *db diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 88dfd67..7e4b4e0 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -2,8 +2,8 @@ set :branch, 'master' set :rails_env, 'production' set :unicorn_rack_env, fetch(:rails_env) -role :app, %w{deploy@ensl.org} -role :web, %w{deploy@ensl.org} -role :db, %w{deploy@ensl.org} +role :app, %w{vu2009@ensl.org} +role :web, %w{vu2009@ensl.org} +role :db, %w{vu2009@ensl.org} -server 'ensl.org', user: 'deploy', roles: %w{web app} +server 'ensl.org', user: 'vu2009', roles: %w{web app}