[DRE-commits] [gitlab] 01/06: don't overwrite nginx configuration

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 8020a96a0168e2ca2e3926501c532d9058504d51
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 8 00:24:03 2016 +0530

    don't overwrite nginx configuration
---
 debian/postinst | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 00a2b5b..2604849 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -52,7 +52,7 @@ case "$1" in
     done
 
 
-    # nginx should be able to connect to gitlab-workhorse.socket and serve public
+    # nginx/httpd should be able to connect to gitlab-workhorse.socket and serve public
     chown ${gitlab_user}:${nginx_user} -R ${gitlab_uploads_path}/.. ${gitlab_pid_path}
     
     # Customize permissions
@@ -113,16 +113,21 @@ case "$1" in
       fi
 
       if test -f ${nginx_conf_example}; then
-        sed -e "s/YOUR_SERVER_FQDN/${GITLAB_HOST}/"\
-        ${nginx_conf_example} >/etc/nginx/sites-available/${GITLAB_HOST}
-        ln -fs /etc/nginx/sites-available/${GITLAB_HOST} /etc/nginx/sites-enabled/
-        rm -f ${nginx_conf_example_tmp}
+        nginx_site="/etc/nginx/sites-available/${GITLAB_HOST}"
+	if test -f ${nginx_site}; then
+	  echo "${nginx_site} is already present, skipping nginx configuration"
+	else
+          sed -e "s/YOUR_SERVER_FQDN/${GITLAB_HOST}/"\
+          ${nginx_conf_example} >/etc/nginx/sites-available/${GITLAB_HOST}
+          ln -fs /etc/nginx/sites-available/${GITLAB_HOST} /etc/nginx/sites-enabled/
+          rm -f ${nginx_conf_example_tmp}
+	fi
       else
         echo "nginx example configuration file not found"
         exit 1
       fi
-      # Start nginx
-      invoke-rc.d nginx start
+      # Reload nginx
+      invoke-rc.d nginx reload
     else
       echo "Failed to retrieve fully qualified domain name"
       exit 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git