From 8bd815dc47ebb323c95012c1a944daa7128471ba Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Wed, 24 Sep 2014 10:39:38 +0200
Subject: [PATCH] fixed issues with the /run directory

---
 www-apps/gitlab-ci/Manifest               |  2 +-
 www-apps/gitlab-ci/gitlab-ci-5.0.1.ebuild | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/www-apps/gitlab-ci/Manifest b/www-apps/gitlab-ci/Manifest
index 19be0eb..353e990 100644
--- a/www-apps/gitlab-ci/Manifest
+++ b/www-apps/gitlab-ci/Manifest
@@ -1,3 +1,3 @@
 AUX gitlab-ci-unicorn.init 1684 SHA256 13887832ca41bf45037918824c7ead731ac812eaeba7fcf2149b981f5649ec9a SHA512 8842684dae88331353fdd09554c7404a470238a0e66597a01b4b9dd875db7b5580b082fb4e230fd85e8fd66c276e789473e88c61584845c2b236c00ba79ea9ac WHIRLPOOL 745d07b9eb116dc5742981b3e0b0b36371bdd2e1629bb988643f806b0ace8927d3f16ead0536285272b4508c4961e8dd1583037871782958283aaaf6d1992fb0
 DIST gitlab-ci-5.0.1.tar.gz 610139 SHA256 5ed7d6de964a05641e14ae6a7bd63e6f32fec345d8f2ea42e6882c67c2228bc1 SHA512 a10f4341001f12f9796594ba2bf1008cbead8ab3f5d98f9de2b56a3f2fc84322841b5bb3cbd596e46bba3ce0285e438ca7597c9f57b84d6231742f8aa64df736 WHIRLPOOL 7b62af01e1202542a3a3c5d947444ebbcee986d2c0c87ebf4191ef2c6e283d261cba675eb405343febd2cdabf028096dc62d7ab0eafa500d05d2033faeadf102
-EBUILD gitlab-ci-5.0.1.ebuild 8381 SHA256 2813bfcc373a7aaf52e78612bd922ddc39b52094de253a15f07af5384667713d SHA512 1ed0a1798ccb76d4f3d40cae7b133947652b50602de542de07b92a091e4cc6535590d6165b83efc5add4392f89ad2dd20268cbc7f4f9c40068469d39f506cc61 WHIRLPOOL 7ae43ff7213d76cc95903980a43300cbe8f6d1049013dfe7419951a4564af5c718d91627091dafa11433ad8fc5240053ef9866df5f85af2391f31d190adb44db
+EBUILD gitlab-ci-5.0.1.ebuild 8463 SHA256 42315b221a2d5fd392510b6c22eb6edd35f6b9b776f71de2ad46524269498482 SHA512 db70f5f95772c46c099447ff2bff0fb8db0287792677fc59f2745497f49d016983d27deaa0270bfd9fbd2d3b06ff6933d31360898c75a9f8f2c6812551610401 WHIRLPOOL ef15ebbe598ed05c33d8343713f99166cb4566b6a51a4d14be2ee65588444e0faff53d437882b624addc3832edcb081c71685e6893c8b76b7091f4cde60105dc
diff --git a/www-apps/gitlab-ci/gitlab-ci-5.0.1.ebuild b/www-apps/gitlab-ci/gitlab-ci-5.0.1.ebuild
index 90916d1..1ea78c8 100644
--- a/www-apps/gitlab-ci/gitlab-ci-5.0.1.ebuild
+++ b/www-apps/gitlab-ci/gitlab-ci-5.0.1.ebuild
@@ -129,7 +129,7 @@ all_ruby_install() {
 	dodir ${logs} ${temp}
 
 	diropts -m755
-	dodir ${conf} ${dest}/public/uploads
+	dodir ${conf} ${runs} ${dest}/public/uploads
 
 	dosym ${temp} ${dest}/tmp
 	dosym ${logs} ${dest}/log
@@ -176,7 +176,7 @@ all_ruby_install() {
 	rm -Rf vendor/bundle/ruby/*/cache
 
 	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
+	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} ${runs}
 
 	## RC script ##
 
@@ -202,7 +202,9 @@ pkg_postinst() {
 	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
 	elog "   for \"production\" environment."
 	elog
-	elog "3. Then you should create a database for your GitLab CI instance, if you"
+	elog "3. Adjust the webserver settings in ${CONF_DIR}/unicorn.rb"
+	elog
+	elog "4. Then you should create a database for your GitLab CI instance, if you"
 	elog "haven't done so already."
 	elog
 	if use postgres; then
@@ -236,13 +238,13 @@ pkg_config() {
 	local gitlab_ci_home="$(egethome ${MY_USER})"
 	
 	# configure Git global settings
-#	if [ ! -e "${gitlab_ci_home}/.gitconfig" ]; then
-#		einfo "Setting git user"
-#		su -l ${MY_USER} -c "
-#			git config --global user.email '${email_from}';
-#			git config --global user.name 'GitLab CI'" \
-#			|| die "failed to setup git name and email"
-#	fi
+	if [ ! -e "${gitlab_ci_home}/.gitconfig" ]; then
+		einfo "Setting git user"
+		su -l ${MY_USER} -c "
+			git config --global user.email '${email_from}';
+			git config --global user.name 'GitLab CI'" \
+			|| die "failed to setup git name and email"
+	fi
 
 	if [ ! -d "${DEST_DIR}/.git" ]; then
 		# create dummy git repo as workaround for