[DRE-commits] [diaspora-installer] 01/02: allow other webservers

[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 eca4697fbd5330c3670eb0769480c7fcf4636f9b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Jan 14 21:12:20 2017 +0530

    allow other webservers
---
 debian/control                  |  2 +-
 debian/diaspora-common.postinst | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index c73a885..13ffb14 100644
--- a/debian/control
+++ b/debian/control
@@ -100,7 +100,7 @@ Depends: adduser,
          dbconfig-pgsql | dbconfig-mysql | dbconfig-no-thanks,
          exim4 | postfix | mail-transport-agent,
          net-tools,
-         nginx,
+         nginx | httpd,
          nodejs,
          postgresql | default-mysql-server | virtual-mysql-server,
          rake,
diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 077ede6..d4708dd 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -59,8 +59,14 @@ case "$1" in
         then
             echo export ENVIRONMENT_URL="https://$SERVERNAME" >> ${diaspora_conf_private}
         fi
-        echo "SSL enabled, configuring nginx for ${SERVERNAME}..."
-        /usr/lib/diaspora-common/scripts/set-env-nginx.sh ${SERVERNAME}
+        # Configure nginx if available
+        if which nginx > /dev/null 2>&1; then
+            echo "SSL enabled, configuring nginx for ${RET}..."
+            /usr/lib/diaspora-common/scripts/set-env-nginx.sh ${RET}
+        else
+            echo "nginx not installed, skipping configuration..."
+        fi
+
         db_go
 
         # Check if letsencrypt option is selected

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