[DRE-commits] [diaspora-installer] 01/01: always write nginx conf to support reconfigure

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora-installer.

commit 05421d65b9406da3508c8aca0c695c55cee42fb0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 28 10:01:43 2017 +0530

    always write nginx conf to support reconfigure
---
 set-env-nginx.sh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/set-env-nginx.sh b/set-env-nginx.sh
index d4d5537..077ae9a 100755
--- a/set-env-nginx.sh
+++ b/set-env-nginx.sh
@@ -14,18 +14,14 @@ fi
 . /etc/diaspora/diaspora-common.conf
 nginx_site_private=/var/lib/diaspora-common/nginx-site-diaspora
 
-if test -f /etc/nginx/sites-available/diaspora; then
-  echo "/etc/nginx/sites-available/diaspora already exist, skipping nginx configuration..."
+if test -f ${nginx_site_example}; then
+  sed -e "s/SERVERNAME_FIXME/$1/g" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora/"\
+  -e "s/DIASPORA_ROOT_FIXME/\\/usr\\/share\\/diaspora/"\
+  ${nginx_site_example} > ${nginx_site_private}
+  ucf --debconf-ok --three-way ${nginx_site_private} /etc/nginx/sites-available/diaspora
+  ln -fs /etc/nginx/sites-available/diaspora /etc/nginx/sites-enabled/
+  ucfr diaspora-common /etc/nginx/sites-available/diaspora
 else
-  if test -f ${nginx_site_example}; then
-    sed -e "s/SERVERNAME_FIXME/$1/g" -e "s/DIASPORA_SSL_PATH_FIXME/\\/etc\\/diaspora/"\
-    -e "s/DIASPORA_ROOT_FIXME/\\/usr\\/share\\/diaspora/"\
-    ${nginx_site_example} > ${nginx_site_private}
-    ucf --debconf-ok --three-way ${nginx_site_private} /etc/nginx/sites-available/diaspora
-    ln -fs /etc/nginx/sites-available/diaspora /etc/nginx/sites-enabled/
-    ucfr diaspora-common /etc/nginx/sites-available/diaspora
-  else
-    echo "nginx.conf.example not found"
-    exit 1
-  fi
-fi  
+  echo "nginx.conf.example not found"
+  exit 1
+fi

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