|
|
@@ -58,8 +58,9 @@ file 'config/database.yml' do |
|
|
|
case database |
|
|
|
when /(mysql|mariadb)/ |
|
|
|
dev_conf = {'adapter' => 'mysql2', |
|
|
|
'database' => dev_db_name, 'host' => 'localhost', |
|
|
|
'encoding' => 'utf8'} |
|
|
|
'database' => dev_db_name, 'host' => (ENV['CI_MYSQL_HOST'] || 'localhost'), |
|
|
|
'encoding' => 'utf8', |
|
|
|
'ssl_mode' => 'disabled'} |
|
|
|
if ENV['RUN_ON_NOT_OFFICIAL'] |
|
|
|
dev_conf['username'] = 'root' |
|
|
|
else |
|
|
@@ -69,7 +70,7 @@ file 'config/database.yml' do |
|
|
|
test_conf = dev_conf.merge('database' => test_db_name) |
|
|
|
when /postgresql/ |
|
|
|
dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name, |
|
|
|
'host' => 'localhost'} |
|
|
|
'host' => (ENV['CI_PG_HOST'] || 'localhost')} |
|
|
|
if ENV['RUN_ON_NOT_OFFICIAL'] |
|
|
|
dev_conf['username'] = 'postgres' |
|
|
|
else |