update mysql config

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index c68d30aaa2c0adbcb6ea9a008bfcfff089bd150e..2980573ffcf540e093f1ac1f72cebf6d595d2c74 100644 (file)
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -73,10 +73,12 @@ use on your server(s).
 %setup -qn gitlabhq-%{version}
 mv config/gitlab.yml.example config/gitlab.yml
 mv config/unicorn.rb.example config/unicorn.rb
-mv config/database.yml.mysql config/database.yml
 %patch0 -p1
 %patch1 -p1
 
+# use mysql for now
+mv config/database.yml.mysql config/database.yml
+
 rm .flayignore
 rm .gitignore
 rm .csscomb.json

diff --git a/pld.patch b/pld.patch
index c2f629c9d6da07c6f4c889e52a8d1360f79fc4e7..da68dbf4a47f343ee164c8d378a6f36de78cf5e1 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -67,3 +67,27 @@
  
  # combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
  # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
+--- gitlabhq-8.7.5/config/database.yml.mysql   2016-05-12 17:35:19.000000000 +0300
++++ gitlabhq-8.7.5/config/database.yml 2016-04-17 13:53:42.000000000 +0300
+@@ -8,8 +8,8 @@
+   reconnect: false
+   database: gitlabhq_production
+   pool: 10
+-  username: git
+-  password: "secure password"
++  username: mysql
++  password: ~
+   # host: localhost
+   # socket: /tmp/mysql.sock
+ 
+@@ -23,8 +23,8 @@
+   reconnect: false
+   database: gitlabhq_development
+   pool: 5
+-  username: root
+-  password: "secure password"
++  username: mysql
++  password: ~
+   # socket: /tmp/mysql.sock
+ 
+ # Warning: The database defined as "test" will be erased and