[packages/gitlab-common: 2/2] use existing git user

glen glen at pld-linux.org
Sat Apr 16 12:30:11 CEST 2016


commit 05cb9cde6ac2f5cb1c74b041f810836091ee340c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 16 13:29:54 2016 +0300

    use existing git user

 gitlab-common.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gitlab-common.spec b/gitlab-common.spec
index 825ea08..09288c5 100644
--- a/gitlab-common.spec
+++ b/gitlab-common.spec
@@ -1,12 +1,13 @@
-%define gitlab_user    gitlab
-%define gitlab_group   gitlab
-
+%define gitlab_user  git
+%define gitlab_group git
+%define gitlab_gid 264
+%define gitlab_uid 264
 Summary:	Just some shared directories and users
 Name:		gitlab-common
 Version:	8.6
 Release:	0.1
 License:	MIT
-Group:		Development/Building
+Group:		Base
 BuildRequires:	rpmbuild(macros) >= 1.202
 Provides:	group(%{gitlab_group})
 Provides:	user(%{gitlab_user})
@@ -47,8 +48,8 @@ chmod -R go= $RPM_BUILD_ROOT%{git_dir}/.ssh
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%groupadd -r %{gitlab_group}
-%useradd  -g %{gitlab_group} -s /bin/sh -r -c "GitLab" -d %{home_dir} %{gitlab_user}
+%groupadd -g %{gitlab_gid} -r %{gitlab_group}
+%useradd -u %{gitlab_uid} -g %{gitlab_group} -s /bin/sh -r -c "GitLab" -d %{home_dir} %{gitlab_user}
 
 %files
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-common.git/commitdiff/05cb9cde6ac2f5cb1c74b041f810836091ee340c



More information about the pld-cvs-commit mailing list