[DRE-commits] [diaspora-installer] 05/08: fix template names

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Sat Dec 31 09:11:50 UTC 2016


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

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

commit 58e0b971cd3891760d77d4bb1bc9cf6e24ffa68d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Dec 31 14:27:28 2016 +0530

    fix template names
---
 debian/diaspora-common.config   | 4 ++--
 debian/diaspora-common.postinst | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/diaspora-common.config b/debian/diaspora-common.config
index 054a6b0..2c0754c 100644
--- a/debian/diaspora-common.config
+++ b/debian/diaspora-common.config
@@ -17,10 +17,10 @@ db_go
 # Don't prompt for letsencrypt if not installed
 if command -v letsencrypt >/dev/null; then
   # Do you want Let's Encrypt?
-  db_get diaspora/ssl
+  db_get diaspora-common/ssl
   if [ "${RET}" = "true" ]
   then
-    db_input high diaspora/letsencrypt || true
+    db_input high diaspora-common/letsencrypt || true
     db_go
   fi
 fi
diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 2f25b00..be149bf 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -64,7 +64,7 @@ case "$1" in
         db_go
 
         # Check if letsencrypt option is selected
-        db_get diaspora/letsencrypt
+        db_get diaspora-common/letsencrypt
         if [ "${RET}" = "true" ]; then
 	  echo "Configuring letsencrypt..."
           ln -sf /etc/letsencrypt/live/${SERVERNAME}/fullchain.pem \
@@ -81,7 +81,6 @@ case "$1" in
 	      echo "Stopping nginx for letsencrypt..."
 	      invoke-rc.d nginx stop
 	    fi
-
 	    letsencrypt -d ${SERVERNAME} certonly || {
 	    echo "letsencrypt auto configuration failed..."
 	    echo "Stop your webserver and try running letsencrypt manually..."
@@ -89,8 +88,6 @@ case "$1" in
 	    }
 	  fi
         fi
-      fi
-
     else
         db_go
         # Configure pod address.

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



More information about the Pkg-ruby-extras-commits mailing list