Resolve conflict in scripts/prepare_build.sh and database.yml.* files

Signed-off-by: Rémy Coutable <remy@rymai.me>

config/database_geo.yml.mysql

@@ -13,7 +13,7 @@ production:
   pool: 10
   username: git
   password: "secure password"
-  # host: localhost
+  host: localhost
   # socket: /tmp/mysql.sock
 
 #
@@ -28,7 +28,22 @@ development:
   pool: 5
   username: root
   password: "secure password"
-  # host: localhost
+  host: localhost
+  # socket: /tmp/mysql.sock
+
+#
+# Staging specific
+#
+staging:
+  adapter: mysql2
+  encoding: utf8
+  collation: utf8_general_ci
+  reconnect: false
+  database: gitlabhq_geo_staging
+  pool: 10
+  username: git
+  password: "secure password"
+  host: localhost
   # socket: /tmp/mysql.sock
 
 # Warning: The database defined as "test" will be erased and
@@ -43,6 +58,5 @@ test: &test
   pool: 5
   username: root
   password:
-  # host: localhost
+  host: localhost
   # socket: /tmp/mysql.sock
-

config/database_geo.yml.postgresql

@@ -6,10 +6,9 @@ production:
   encoding: unicode
   database: gitlabhq_geo_production
   pool: 10
-  # username: git
-  # password:
-  # host: localhost
-  # port: 5432
+  username: git
+  password: "secure password"
+  host: localhost
 
 #
 # Development specific
@@ -20,8 +19,8 @@ development:
   database: gitlabhq_geo_development
   pool: 5
   username: postgres
-  password:
-  # host: localhost
+  password: "secure password"
+  host: localhost
 
 #
 # Staging specific
@@ -30,10 +29,10 @@ staging:
   adapter: postgresql
   encoding: unicode
   database: gitlabhq_geo_staging
-  pool: 5
-  username: postgres
-  password:
-  # host: localhost
+  pool: 10
+  username: git
+  password: "secure password"
+  host: localhost
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -45,4 +44,4 @@ test: &test
   pool: 5
   username: postgres
   password:
-  # host: localhost
+  host: localhost

scripts/prepare_build.sh

@@ -30,25 +30,15 @@ cp config/database.yml.$GITLAB_DATABASE config/database.yml
 cp config/database_geo.yml.$GITLAB_DATABASE config/database_geo.yml
 
 if [ "$GITLAB_DATABASE" = 'postgresql' ]; then
-<<<<<<< HEAD
-    sed -i 's/# host:.*/host: postgres/g' config/database.yml
+    sed -i 's/localhost/postgres/g' config/database.yml
 
     # EE-only
-    sed -i 's/# host:.*/host: postgres/g' config/database_geo.yml
+    sed -i 's/localhost/postgres/g' config/database_geo.yml
 else # Assume it's mysql
-    sed -i 's/username:.*/username: root/g' config/database.yml
-    sed -i 's/password:.*/password:/g' config/database.yml
-    sed -i 's/# host:.*/host: mysql/g' config/database.yml
+    sed -i 's/localhost/mysql/g' config/database.yml
 
     # EE-only
-    sed -i 's/username:.*/username: root/g' config/database_geo.yml
-    sed -i 's/password:.*/password:/g' config/database_geo.yml
-    sed -i 's/# host:.*/host: mysql/g' config/database_geo.yml
-=======
-    sed -i 's/localhost/postgres/g' config/database.yml
-else # Assume it's mysql
-    sed -i 's/localhost/mysql/g' config/database.yml
->>>>>>> upstream/master
+    sed -i 's/localhost/mysql/g' config/database_geo.yml
 fi
 
 cp config/resque.yml.example config/resque.yml