diff --git a/debian/postinst b/debian/postinst index 00a2b5b4a0..2604849813 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