[packages/gitlab-shell] use git/git uid

[glen]

commit d56df2c08b4cb2160af8ed820fb7824252f0a0cc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri May 13 21:53:24 2016 +0300

    use git/git uid

 gitlab-shell.spec | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/gitlab-shell.spec b/gitlab-shell.spec
index 9f70fc8..43f16b5 100644
--- a/gitlab-shell.spec
+++ b/gitlab-shell.spec
@@ -1,3 +1,7 @@
+%define uid 264
+%define gid 264
+%define uname git
+%define gname git
 Summary:	GitLab ssh access and repository management
 Name:		gitlab-shell
 Version:	2.7.2
@@ -11,14 +15,20 @@ URL:		https://github.com/gitlabhq/gitlab-shell
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.665
 BuildRequires:	sed >= 4.0
+Provides:	group(%{gname})
+Provides:	user(%{uname})
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
 Requires:	git-core >= 2.7.3
 Requires:	redis >= 2.8.0
 Requires:	ruby >= 1:2.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define gitlab_uid 65434
-%define gitlab_gid 65434
 %define homedir %{_localstatedir}/lib/gitlab
 
 %description
@@ -62,10 +72,8 @@ ln -s %{_sysconfdir}/gitlab/.gitlab_shell_secret $RPM_BUILD_ROOT%{_datadir}/%{na
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ $1 -ge 1 ]; then
-	%groupadd gitlab -g %{gitlab_gid}
-	%useradd -u %{gitlab_uid} -c 'Gitlab user' -d %{homedir} -g gitlab -s /bin/false gitlab
-fi
+%groupadd -g %{gid} %{gname}
+%useradd -u %{uid} -c 'Git user' -d %{homedir} -g git -s /bin/false %{uname}
 
 %post
 if [ $1 -eq 1 ]; then
@@ -73,6 +81,12 @@ if [ $1 -eq 1 ]; then
 	echo "      sudo -u gitlab -H bundle exec rake gitlab:shell:setup RAILS_ENV=production"
 fi
 
+%postun
+if [ "$1" = "0" ]; then
+	%userremove git
+	%groupremove git
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc README.md CHANGELOG LICENSE
@@ -90,6 +104,6 @@ fi
 %attr(755,root,root) %{_datadir}/%{name}/hooks/*
 
 %dir %{homedir}
-%dir %attr(700,gitlab,gitlab) %{homedir}/.ssh
-%config(noreplace) %attr(600,gitlab,gitlab) %{homedir}/.ssh/authorized_keys
-%dir %attr(2770,gitlab,gitlab) %{homedir}/repositories
+%dir %attr(700,%{uname},%{gname}) %{homedir}/.ssh
+%config(noreplace) %attr(600,%{uname},%{gname}) %{homedir}/.ssh/authorized_keys
+%dir %attr(2770,%{uname},%{gname}) %{homedir}/repositories
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-shell.git/commitdiff/d56df2c08b4cb2160af8ed820fb7824252f0a0cc