[packages/gitlab-ce] add /var/cache

glen glen at pld-linux.org
Tue Aug 30 17:59:15 CEST 2016


commit 0f95858b221ff29bf21c981950baaa9dd3d9b7e7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 30 18:13:45 2016 +0300

    add /var/cache

 gitlab-ce.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 801fca1..8fefbed 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.11.3
-Release:	0.68
+Release:	0.69
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -70,6 +70,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define gname git
 %define homedir %{_prefix}/lib/gitlab
 %define vardir  %{_localstatedir}/lib/gitlab
+%define cachedir  %{_localstatedir}/cache/gitlab
 
 %description
 GitLab Community Edition (CE) is open source software to collaborate
@@ -155,6 +156,7 @@ install -d \
 	$RPM_BUILD_ROOT%{_sysconfdir}/gitlab \
 	$RPM_BUILD_ROOT%{_docdir}/gitlab \
 	$RPM_BUILD_ROOT%{vardir}/public \
+	$RPM_BUILD_ROOT%{cachedir}/tmp \
 	$RPM_BUILD_ROOT%{_localstatedir}/{run,log}/gitlab
 
 # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
@@ -209,6 +211,9 @@ for a in satellites shared tmp public/{uploads,assets}; do
 	move_symlink %{homedir}/$a %{vardir}/$a
 done
 
+move_symlink %{vardir}/tmp/cache %{cachedir}/cache
+move_symlink %{vardir}/shared/artifacts/tmp/cache %{cachedir}/artifacts
+
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{systemdunitdir},%{systemdtmpfilesdir}} \
 	$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,httpd/webapps.d}
 
@@ -330,18 +335,21 @@ fi
 %attr(-,%{uname},%{gname}) %{vardir}/public/assets
 %dir %attr(755,%{uname},%{gname}) %{vardir}/tmp
 %attr(-,%{uname},%{gname}) %{vardir}/tmp/backups
-%attr(-,%{uname},%{gname}) %{vardir}/tmp/cache
+%{vardir}/tmp/cache
 %attr(-,%{uname},%{gname}) %{vardir}/tmp/sessions
 %attr(-,%{uname},%{gname}) %{vardir}/tmp/sockets
 %attr(-,%{uname},%{gname}) %{vardir}/tmp/pids
 %dir %attr(750,%{uname},%{gname}) %{vardir}/shared
 %dir %attr(750,%{uname},%{gname}) %{vardir}/shared/artifacts
 %dir %attr(750,%{uname},%{gname}) %{vardir}/shared/artifacts/tmp
-%dir %attr(750,%{uname},%{gname}) %{vardir}/shared/artifacts/tmp/cache
+%{vardir}/shared/artifacts/tmp/cache
 %dir %attr(750,%{uname},%{gname}) %{vardir}/shared/artifacts/tmp/uploads
 %dir %attr(750,%{uname},%{gname}) %{vardir}/shared/lfs-objects
 %dir %attr(750,%{uname},%{gname}) %{vardir}/shared/registry
 
+%dir %attr(750,root,%{gname}) %{cachedir}
+%attr(-,%{uname},%{gname}) %{cachedir}/cache
+%dir %attr(750,%{uname},%{gname}) %{cachedir}/artifacts
 
 %dir %attr(771,root,%{gname}) %{_localstatedir}/log/gitlab
 %dir %attr(771,root,%{gname}) %{_localstatedir}/run/gitlab
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/0f95858b221ff29bf21c981950baaa9dd3d9b7e7



More information about the pld-cvs-commit mailing list