From cd7c33876bc6746fe5c9bdf8b4e38983003a4cfe Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 9 Oct 2013 01:01:41 +0530
Subject: [PATCH] install: moved nginx configuration to install script

---
 resources/install | 3 +++
 resources/start   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/install b/resources/install
index 20d5d087..f4544e69 100755
--- a/resources/install
+++ b/resources/install
@@ -65,3 +65,6 @@ sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
 
 # create the /var/run/sshd directory (required for sshd to start)
 mkdir -p /var/run/sshd
+
+# configure nginx
+sed 's/YOUR_SERVER_FQDN/localhost/' -i /etc/nginx/sites-available/gitlab
diff --git a/resources/start b/resources/start
index ca8c29b3..b0458d0e 100755
--- a/resources/start
+++ b/resources/start
@@ -94,7 +94,6 @@ 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
-sed 's/YOUR_SERVER_FQDN/localhost/' -i /etc/nginx/sites-available/gitlab
 
 # configure database
 sudo -u git -H sed 's/{{DB_HOST}}/'${DB_HOST}'/' -i /home/git/gitlab/config/database.yml