From 95ee3b9360db429f2b917fa4a99dfad40f985a6b Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 9 Oct 2013 00:58:39 +0530
Subject: [PATCH] start: moved git user/email config to start script

---
 resources/install | 5 -----
 resources/start   | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/install b/resources/install
index 9cd9d4eb..20d5d087 100755
--- a/resources/install
+++ b/resources/install
@@ -37,11 +37,6 @@ chmod -R u+rwX  public/uploads
 # create satellites directory
 sudo -u git -H mkdir -p /home/git/gitlab-satellites
 
-# configure git for the 'git' user
-sudo -u git -H git config --global user.name "GitLab"
-sudo -u git -H git config --global user.email "gitlab@localhost"
-sudo -u git -H git config --global core.autocrlf input
-
 # install gems required by gitlab
 gem install charlock_holmes --version '0.6.9.4'
 sudo -u git -H bundle install --deployment --without development test postgres aws
diff --git a/resources/start b/resources/start
index c9e1598b..ca8c29b3 100755
--- a/resources/start
+++ b/resources/start
@@ -86,6 +86,11 @@ fi
 redis-server > /dev/null &
 sleep 3
 
+# configure git for the 'git' user
+sudo -u git -H git config --global user.name "GitLab"
+sudo -u git -H git config --global user.email "gitlab@localhost"
+sudo -u git -H git config --global core.autocrlf input
+
 # configure server url
 # sudo -u git -H sed 's/http:\/\/localhost/http:\/\/'${SERVER_URL}'/' -i /home/git/gitlab-shell/config.yml
 sudo -u git -H sed 's/host: localhost/host: '${SERVER_URL}'/' -i /home/git/gitlab/config/gitlab.yml