added patch for database config. corresponds more or less to 0002-default-configs.patch by Jakub Jirutka.

This commit is contained in:
Manuel Friedli 2016-10-11 12:22:25 +02:00
parent d68928dc20
commit a024391bc7
3 changed files with 47 additions and 1 deletions

View file

@ -0,0 +1,44 @@
diff --git a/database.yml b/database.yml
index a99c507..0f081c8 100644
--- a/database.yml
+++ b/database.yml
@@ -6,37 +6,9 @@ production:
encoding: utf8
collation: utf8_general_ci
reconnect: false
- database: gitlabhq_production
+ database: gitlab
pool: 10
username: git
password: "secure password"
# host: localhost
- # socket: /tmp/mysql.sock
-
-#
-# Development specific
-#
-development:
- adapter: mysql2
- encoding: utf8
- collation: utf8_general_ci
- reconnect: false
- database: gitlabhq_development
- pool: 5
- username: root
- password: "secure password"
- # socket: /tmp/mysql.sock
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test: &test
- adapter: mysql2
- encoding: utf8
- collation: utf8_general_ci
- reconnect: false
- database: gitlabhq_test
- pool: 5
- username: root
- password:
- # socket: /tmp/mysql.sock
+ # socket: /run/mysqld/mysqld.sock