835c4447f6
- Removed launchy since I couldn't find any use of it - Ruby 1.9 seems to need em-synchrony explictly - No need to recreate the Gemfile.lock on Travis if proper :platforms options are used in the Gemfile - Removed group :development, :test and moved the stuff in the corresponding sections - Install adapter Gems according to the env var DB, install al if it is unset - Merged database.yml.postgres into database.yml.example. Bonus point: easier switching between mysql and postgres - May break everything but lets see what CI says
36 lines
541 B
Text
36 lines
541 B
Text
mysql: &mysql
|
|
adapter: mysql2
|
|
host: "localhost"
|
|
port: 3306
|
|
username: "root"
|
|
password: ""
|
|
# socket: /tmp/mysql.sock
|
|
charset: utf8
|
|
collation: utf8_bin
|
|
|
|
postgres: &postgres
|
|
adapter: postgresql
|
|
host: localhost
|
|
port: 5432
|
|
username: postgres
|
|
password:
|
|
encoding: unicode
|
|
|
|
|
|
common: &common
|
|
# Choose one of the following
|
|
<<: *mysql
|
|
#<<: *postgres
|
|
|
|
|
|
development:
|
|
<<: *common
|
|
database: diaspora_development
|
|
|
|
production:
|
|
<<: *common
|
|
database: diaspora_production
|
|
|
|
test:
|
|
<<: *common
|
|
database: "diaspora_test"
|