[packages/gitlab-ce] setup default .gitconfig

glen glen at pld-linux.org
Sun May 15 14:11:44 CEST 2016


commit e29cce1b42cc84a9e2c9e94f678f2b67ffff1fae
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun May 15 14:38:04 2016 +0300

    setup default .gitconfig

 gitconfig      | 5 +++++
 gitlab-ce.spec | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index e9cec71..759e32c 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.7.5
-Release:	0.19.2
+Release:	0.19.4
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -33,6 +33,7 @@ Source6:	gitlab.logrotate
 Source7:	gitlab.tmpfiles.d
 Source8:	gitlab-apache-conf
 Source9:	gitlab-rake.sh
+Source10:	gitconfig
 BuildRequires:	cmake
 BuildRequires:	gmp-devel
 BuildRequires:	libgit2-devel
@@ -176,6 +177,7 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/gitlab.target
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/gitlab.conf
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/gitlab.logrotate
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/httpd/webapps.d/gitlab.conf
+cp -p %{SOURCE10} $RPM_BUILD_ROOT%{homedir}/.gitconfig
 install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/gitlab-rake
 
 %clean
@@ -194,9 +196,6 @@ if [ $1 -eq 1 ]; then
 	systemctl -q start gitlab-unicorn
 	systemctl -q start gitlab-sidekiq
 	systemctl -q start gitlab.target
-	sudo -u gitlab -H git config --global user.name "GitLab"
-	sudo -u gitlab -H git config --global user.email "gitlab at localhost"
-	sudo -u gitlab -H git config --global core.autocrlf input
 	echo "Create and configure database in /etc/gitlab/database.yml"
 	echo "Then run 'sudo -u gitlab bundle exec rake gitlab:setup RAILS_ENV=production'"
 	echo
@@ -228,6 +227,7 @@ fi
 %{systemdunitdir}/gitlab.target
 %{systemdtmpfilesdir}/gitlab.conf
 %dir %attr(755,%{uname},%{gname}) %{homedir}
+%dir %attr(640,%{uname},%{gname}) %{homedir}/.gitconfig
 %dir %attr(755,%{uname},%{gname}) %{homedir}/app
 %attr(-,%{uname},%{gname}) %{homedir}/app/*
 %dir %attr(755,%{uname},%{gname}) %{homedir}/bin
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..9c6a81f
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,5 @@
+[user]
+	name = GitLab
+	email = gitlab at localhost
+[core]
+	autocrlf = input
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list