fix redis_config path problem

2 files changed, 6 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 934d8de1321e..a85e0c3cc2df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Mar 23 10:07:37 UTC 2016
+# Thu Mar 24 10:35:18 UTC 2016
 pkgbase = gitlab
 	pkgdesc = Project management and code hosting application
 	pkgver = 8.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gitlab.org/gitlab-ce
 	install = gitlab.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index cd9f92a939a5..81c894ebbfa7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=gitlab
 pkgver=8.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Project management and code hosting application"
 arch=('i686' 'x86_64')
 url="http://gitlab.org/gitlab-ce"
@@ -112,6 +112,9 @@ prepare() {
 		config/database.yml.mysql > config/database.yml
 	sed -e "s|production: unix:/var/run/redis/redis.sock|production: redis://localhost:6379|" \
 		config/resque.yml.example > config/resque.yml
+	msg2 "Patching redis_config path"
+	sed -i "s|require_relative '../lib/gitlab/redis_config'|require '${_datadir}/lib/gitlab/redis_config'|g" config/application.rb
+	sed -i "s|require_relative \"lib/gitlab/redis_config\"|require '${_datadir}/lib/gitlab/redis_config'|g" config/mail_room.yml
 	msg2 "setting up systemd service files ..."
 	for __srv in gitlab-sidekiq.service gitlab-unicorn.service gitlab.logrotate gitlab.tmpfiles.d gitlab-backup.service gitlab-mailroom.service; do
 		sed -i "s|<HOMEDIR>|${_homedir}|g" "${srcdir}/${__srv}"