Skip to content

Commit

Permalink
Make the db host configurable via environment variables
Browse files Browse the repository at this point in the history
  • Loading branch information
daronco committed Mar 8, 2017
1 parent 37f8870 commit 4d01dfd
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Database configurations
MCONF_DATABASE_DEV_ADAPTER='mysql2'
MCONF_DATABASE_DEV='mconf_web_dev'
MCONF_DATABASE_DEV_HOST='127.0.0.1'
MCONF_DATABASE_DEV_NAME='mconf_web_dev'
MCONF_DATABASE_DEV_USERNAME='root'
MCONF_DATABASE_DEV_PASSWORD=''

Expand Down
3 changes: 1 addition & 2 deletions .env.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
MCONF_DATABASE_PROD_ADAPTER='mysql2'
MCONF_DATABASE_PROD='mconf_web_production'
MCONF_DATABASE_PROD_NAME='mconf_web_production'
MCONF_DATABASE_PROD_USERNAME='root'
MCONF_DATABASE_PROD_PASSWORD=''
3 changes: 1 addition & 2 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
MCONF_DATABASE_TEST_ADAPTER='mysql2'
MCONF_DATABASE_TEST='mconf_web_test'
MCONF_DATABASE_TEST_NAME='mconf_web_test'
MCONF_DATABASE_TEST_USERNAME='root'
MCONF_DATABASE_TEST_PASSWORD=''
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bundler_args: "--without production development"
env:
global:
- MCONF_DATABASE_TEST_ADAPTER='mysql2'
- MCONF_DATABASE_TEST='mconf_test'
- MCONF_DATABASE_TEST_NAME='mconf_test'
- MCONF_DATABASE_TEST_USERNAME='travis'
- MCONF_DATABASE_TEST_PASSWORD=''
before_script:
Expand Down
21 changes: 12 additions & 9 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
# MySQL (default setup). Versions 4.1 and 5.0 are recommended.

development:
adapter: <%= ENV['MCONF_DATABASE_DEV_ADAPTER'] || 'mysql2' %>
database: <%= ENV['MCONF_DATABASE_DEV'] || 'mconf_web_dev' %>
adapter: <%= ENV['MCONF_DATABASE_DEV_ADAPTER'] || 'mysql2' %>
host: <%= ENV['MCONF_DATABASE_DEV_HOST'] || '127.0.0.1' %>
database: <%= ENV['MCONF_DATABASE_DEV_NAME'] || 'mconf_web_dev' %>
username: <%= ENV['MCONF_DATABASE_DEV_USERNAME'] %>
password: <%= ENV['MCONF_DATABASE_DEV_PASSWORD'] %>
socket: <%= ENV['MCONF_DATABASE_DEV_SOCKET'] || '/var/run/mysqld/mysqld.sock' %>
socket: <%= ENV['MCONF_DATABASE_DEV_SOCKET'] || '/var/run/mysqld/mysqld.sock' %>
encoding: utf8

test:
adapter: <%= ENV['MCONF_DATABASE_TEST_ADAPTER'] || 'mysql2' %>
database: <%= ENV['MCONF_DATABASE_TEST'] || 'mconf_web_test' %>
adapter: <%= ENV['MCONF_DATABASE_TEST_ADAPTER'] || 'mysql2' %>
host: <%= ENV['MCONF_DATABASE_TEST_HOST'] || '127.0.0.1' %>
database: <%= ENV['MCONF_DATABASE_TEST_NAME'] || 'mconf_web_test' %>
username: <%= ENV['MCONF_DATABASE_TEST_USERNAME'] %>
password: <%= ENV['MCONF_DATABASE_TEST_PASSWORD'] %>
socket: <%= ENV['MCONF_DATABASE_TEST_SOCKET'] || '/var/run/mysqld/mysqld.sock' %>
socket: <%= ENV['MCONF_DATABASE_TEST_SOCKET'] || '/var/run/mysqld/mysqld.sock' %>
encoding: utf8

production:
adapter: <%= ENV['MCONF_DATABASE_PROD_ADAPTER'] || 'mysql2' %>
database: <%= ENV['MCONF_DATABASE_PROD'] || 'mconf_web_production' %>
adapter: <%= ENV['MCONF_DATABASE_PROD_ADAPTER'] || 'mysql2' %>
host: <%= ENV['MCONF_DATABASE_PROD_HOST'] || '127.0.0.1' %>
database: <%= ENV['MCONF_DATABASE_PROD_NAME'] || 'mconf_web_production' %>
username: <%= ENV['MCONF_DATABASE_PROD_USERNAME'] %>
password: <%= ENV['MCONF_DATABASE_PROD_PASSWORD'] %>
socket: <%= ENV['MCONF_DATABASE_PROD_SOCKET'] || '/var/run/mysqld/mysqld.sock' %>
socket: <%= ENV['MCONF_DATABASE_PROD_SOCKET'] || '/var/run/mysqld/mysqld.sock' %>
encoding: utf8

0 comments on commit 4d01dfd

Please sign in to comment.