[DRE-commits] [diaspora-installer] 06/15: remove diaspora.conf private copy

[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 4ec9f0a313a255ca68d656b1de016a4aa6bef49c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 27 15:41:18 2016 +0530

    remove diaspora.conf private copy
---
 debian/diaspora-common.postinst | 13 ++++++++-----
 debian/diaspora-common.postrm   |  2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index a08d52a..037d148 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -62,10 +62,10 @@ case "$1" in
              
 	    # Configure pod address.
             db_get diaspora-common/url
+            export SERVERNAME=${RET}
             if ! grep SERVERNAME ${diaspora_conf_private}
               then
-                echo export SERVERNAME=${RET} >> ${diaspora_conf_private}
-                export SERVERNAME=${RET}
+                echo export SERVERNAME=${SERVERNAME} >> ${diaspora_conf_private}
             fi
  
             # Get ssl choice
@@ -73,9 +73,12 @@ case "$1" in
             if [ "${RET}" = "true" ]; then
                 db_go
                 # Configure pod address.
-                db_get diaspora-common/url
-                echo "SSL enabled, configuring nginx for ${RET}..."
-                /usr/lib/diaspora-common/scripts/set-env-nginx.sh ${RET}
+                if ! grep ENVIRONMENT_URL ${diaspora_conf_private}
+                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}
                 db_go
             else
                 db_go
diff --git a/debian/diaspora-common.postrm b/debian/diaspora-common.postrm
index bbd0982..b3cf769 100644
--- a/debian/diaspora-common.postrm
+++ b/debian/diaspora-common.postrm
@@ -24,6 +24,8 @@ case "$1" in
     rm -rf usr/share/diaspora/app/assets/images/branding
     rm -rf /usr/share/diaspora/.bundle
     rm -rf /usr/share/diaspora/Gemfile.lock
+    rm -rf /var/lib/diaspora-common/diaspora.conf
+    rm -rf /var/lib/diaspora-common/database.yml
 
     # Remove diversion
     # ldconfig is NOT needed during removal of a library, only during

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