From bab4217300410576b687834a254bac26e996c77c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 25 May 2016 23:16:47 +0300
Subject: [PATCH] package /var/run/gitlab, update pids and sockets paths

---
 gitlab-ce.spec      | 25 +++++++++++++++----------
 gitlab-sidekiq.init |  2 +-
 gitlab-unicorn.init |  2 +-
 gitlab.tmpfiles.d   |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 4d15632..1a21d4e 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -17,7 +17,7 @@
 Summary:	A Web interface to create projects and repositories, manage access and do code reviews
 Name:		gitlab-ce
 Version:	8.8.1
-Release:	0.25
+Release:	0.28
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -143,6 +143,7 @@ install -d \
 	$RPM_BUILD_ROOT%{homedir}/tmp/{cache/assets,sessions} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/gitlab \
 	$RPM_BUILD_ROOT%{_docdir}/gitlab \
+	$RPM_BUILD_ROOT%{_localstatedir}/{run,log}/gitlab
 
 # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
 if cp -al VERSION $RPM_BUILD_ROOT/VERSION 2>/dev/null; then
@@ -160,11 +161,10 @@ chmod -R u+w $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/gems/*/test
 rm -r $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/gems/*/test
 
 # Creating links
-ln -fs /run/gitlab $RPM_BUILD_ROOT%{homedir}/pids
-ln -fs /run/gitlab $RPM_BUILD_ROOT%{homedir}/sockets
-rmdir $RPM_BUILD_ROOT%{homedir}/log
-ln -fs %{_localstatedir}/log/gitlab $RPM_BUILD_ROOT%{homedir}/log
-install -d $RPM_BUILD_ROOT%{_localstatedir}/log/gitlab
+rmdir $RPM_BUILD_ROOT%{homedir}/{log,tmp/{pids,sockets}}
+ln -s %{_localstatedir}/run/gitlab $RPM_BUILD_ROOT%{homedir}/tmp/pids
+ln -s %{_localstatedir}/run/gitlab $RPM_BUILD_ROOT%{homedir}/tmp/sockets
+ln -s %{_localstatedir}/log/gitlab $RPM_BUILD_ROOT%{homedir}/log
 
 move_config() {
 	local source=$1 target=$2
@@ -252,7 +252,6 @@ fi
 %attr(-,%{uname},%{gname}) %{homedir}/doc/*
 %dir %attr(755,%{uname},%{gname}) %{homedir}/lib
 %attr(-,%{uname},%{gname}) %{homedir}/lib/*
-%dir %attr(755,%{uname},%{gname}) %{homedir}/pids
 
 %{homedir}/fixtures
 %{homedir}/generator_templates
@@ -263,9 +262,14 @@ fi
 %attr(-,%{uname},%{gname}) %{homedir}/public/uploads
 %attr(-,%{uname},%{gname}) %{homedir}/public/assets
 %dir %attr(755,%{uname},%{gname}) %{homedir}/satellites
-%dir %attr(755,%{uname},%{gname}) %{homedir}/sockets
+
 %dir %attr(755,%{uname},%{gname}) %{homedir}/tmp
-%attr(-,%{uname},%{gname}) %{homedir}/tmp/*
+%attr(-,%{uname},%{gname}) %{homedir}/tmp/backups
+%attr(-,%{uname},%{gname}) %{homedir}/tmp/cache
+%attr(-,%{uname},%{gname}) %{homedir}/tmp/sessions
+%attr(-,%{uname},%{gname}) %{homedir}/tmp/sockets
+%attr(-,%{uname},%{gname}) %{homedir}/tmp/pids
+
 %dir %attr(755,%{uname},%{gname}) %{homedir}/www
 
 %dir %attr(750,%{uname},%{gname}) %{homedir}/shared
@@ -290,7 +294,8 @@ fi
 %attr(-,%{uname},%{gname}) %{homedir}/config.ru
 
 %{homedir}/log
-%dir %attr(771,root,%{gname}) /var/log/gitlab
+%dir %attr(771,root,%{gname}) %{_localstatedir}/log/gitlab
+%dir %attr(771,root,%{gname}) %{_localstatedir}/run/gitlab
 
 %defattr(-,root,root,-)
 %dir %{homedir}/vendor
diff --git a/gitlab-sidekiq.init b/gitlab-sidekiq.init
index a3f7e66..68e2da4 100755
--- a/gitlab-sidekiq.init
+++ b/gitlab-sidekiq.init
@@ -34,7 +34,7 @@ USER=git
 APP_PATH=/var/lib/gitlab
 
 # The PID and LOCK files used by unicorn and sidekiq
-pidfile=$APP_PATH/pids/sidekiq.pid
+pidfile=$APP_PATH/tmp/pids/sidekiq.pid
 lockfile=/var/lock/subsys/gitlab-sidekiq
 
 # Get service config - may override defaults
diff --git a/gitlab-unicorn.init b/gitlab-unicorn.init
index 3b99c3c..53dbca2 100755
--- a/gitlab-unicorn.init
+++ b/gitlab-unicorn.init
@@ -34,7 +34,7 @@ USER=git
 APP_PATH=/var/lib/gitlab
 
 # The PID and LOCK files used by unicorn and sidekiq
-pidfile=$APP_PATH/pids/unicorn.pid
+pidfile=$APP_PATH/tmp/pids/unicorn.pid
 lockfile=/var/lock/subsys/gitlab-unicorn
 
 # Get service config - may override defaults
diff --git a/gitlab.tmpfiles.d b/gitlab.tmpfiles.d
index b359ba9..0f9e93c 100644
--- a/gitlab.tmpfiles.d
+++ b/gitlab.tmpfiles.d
@@ -1 +1 @@
-d /run/gitlab 0755 gitlab gitlab -
+d /var/run/gitlab 0771 root gitlab -
-- 
2.44.0