Make the database.yml example file generic

So it works with environment variables (12 factory baby!). Enables
us to drop all enviroment specific 'special' example files.
This commit is contained in:
Henne Vogelsang 2018-09-05 01:48:46 +02:00
parent 0eb1ef337a
commit 6f061756ae
4 changed files with 23 additions and 59 deletions

View file

@ -1,7 +0,0 @@
production:
adapter: mysql2
host: <%= ENV['DATABASE_HOST'] %>
port: <%= ENV['DATABASE_PORT'] %>
username: <%= ENV['MYSQL_USER'] %>
password: <%= ENV['MYSQL_PASSWORD'] %>
database: <%= ENV['MYSQL_DATABASE'] %>

View file

@ -1,54 +1,32 @@
# SQLite version 3.x <%
# gem install sqlite3 encoding = 'unicode'
# if ENV['OSEM_DB_ADAPTER'] == 'mysql2'
# Ensure the SQLite 3 gem is defined in your Gemfile encoding = 'utf8'
# gem 'sqlite3' end
development: %>
adapter: sqlite3
database: db/development.sqlite3
default: &default
adapter: <%= ENV['OSEM_DB_ADAPTER'] || 'postgresql' %>
encoding: <%= encoding %>
host: <%= ENV['OSEM_DB_HOST'] || 'database' %>
port: <%= ENV['OSEM_DB_PORT'] || '5432' %>
username: <%= ENV['OSEM_DB_USER'] || 'postgres' %>
password: <%= ENV['OSEM_DB_PASSWORD'] || 'mysecretpassword' %>
database: <%= ENV['OSEM_DB_NAME'] || 'postgres' %>
pool: 5 pool: 5
timeout: 5000 timeout: 5000
## PostgreSQL development:
## gem install pg <<: *default
## database: osem_development
## Ensure the postgres gem is defined in your Gemfile
## gem 'pg'
## Update with your database name and login credentials
# development:
# adapter: postgresql
# encoding: unicode
# database: database_name
# pool: 5
# username: username
# password: password
## MySQL
## gem install mysql2
##
## Ensure the mysql gem is defined in your Gemfile
## gem 'mysql2'
## Update with your database name and login credentials
# development:
# adapter: mysql2
# encoding: utf8
# database: database_name
# pool: 5
# username: username
# password: password
# socket: /tmp/mysql.sock
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated when you run "rake".
# Do not set this db to the same as development or production. # Do not set this db to the same as development or production.
test: test:
adapter: sqlite3 <<: *default
database: db/test.sqlite3 database: osem_test
pool: 5
timeout: 5000
production: production:
adapter: sqlite3 <<: *default
database: db/production.sqlite3
pool: 5
timeout: 5000

View file

@ -1,2 +0,0 @@
production:
url: <%= ENV["CLEARDB_DATABASE_URL"].sub(/^mysql/, "mysql2") %>

View file

@ -1,5 +0,0 @@
test:
adapter: mysql2
database: osem_test
username: root
encoding: utf8