[packages/gitlab-ce] update mysql config
glen
glen at pld-linux.org
Sun May 15 20:41:48 CEST 2016
commit e3e185ca214af0d210303b649a175608a02c1f6b
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun May 15 21:38:44 2016 +0300
update mysql config
gitlab-ce.spec | 4 +++-
pld.patch | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index c68d30a..2980573 100644
--- 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 c2f629c..da68dbf 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/282ff2500045ec9d96063b5a443be1c2e3f6ae78
More information about the pld-cvs-commit
mailing list