[DRE-commits] [diaspora-installer] 01/15: fix SERVERNAME varibale

[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 7504fad7c6c4b15db886a63b5ced700ccbf1b05a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 27 09:16:06 2016 +0530

    fix SERVERNAME varibale
---
 debian/changelog                |  6 ++++++
 debian/diaspora-common.postinst | 14 ++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dda41d0..68a9358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diaspora-installer (0.6.0.0+debian3) UNRELEASED; urgency=medium
+
+  * Fix SERVERNAME variable creation 
+
+ -- Pirate Praveen <praveen at debian.org>  Tue, 27 Sep 2016 09:15:31 +0530
+
 diaspora-installer (0.6.0.0+debian2) experimental; urgency=medium
 
   * Update startscript.log path in init script 
diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 4eb9ffa..a08d52a 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -59,7 +59,15 @@ case "$1" in
             . /usr/share/dbconfig-common/dpkg/postinst
 
             dbc_go diaspora-common "$@"
-
+             
+	    # Configure pod address.
+            db_get diaspora-common/url
+            if ! grep SERVERNAME ${diaspora_conf_private}
+              then
+                echo export SERVERNAME=${RET} >> ${diaspora_conf_private}
+                export SERVERNAME=${RET}
+            fi
+ 
             # Get ssl choice
             db_get diaspora-common/ssl
             if [ "${RET}" = "true" ]; then
@@ -74,10 +82,8 @@ case "$1" in
                 # Configure pod address.
                 db_get diaspora-common/url
                 echo "SSL disabled, skip nginx configuration for ${RET}..."
-                if ! grep SERVERNAME ${diaspora_conf_private}
+                if ! grep ENVIRONMENT_URL ${diaspora_conf_private}
                 then
-                    echo export SERVERNAME=${RET} >> ${diaspora_conf_private}
-                    export SERVERNAME=${RET}
                     echo export ENVIRONMENT_URL="http://$SERVERNAME:3000" >> ${diaspora_conf_private}
                 fi
             fi

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