[DRE-commits] [diaspora-installer] 06/20: allow mysql or pgsql

[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 de6858f01bb107bde9f75ef736b14a5ab3302488
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Mar 21 14:50:21 2016 +0530

    allow mysql or pgsql
---
 debian/diaspora-common.config | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/diaspora-common.config b/debian/diaspora-common.config
index 8f72f72..844f54a 100644
--- a/debian/diaspora-common.config
+++ b/debian/diaspora-common.config
@@ -21,10 +21,6 @@ else
     db_input high diaspora-common/ssl || true
     db_go
 
-    # DB password can be left blank
-    db_input high diaspora-common/dbpass || true
-    db_go
-
     db_input high diaspora-common/services || true
     db_go
     db_get diaspora-common/services
@@ -138,13 +134,18 @@ else
     fi
 
 
+    # DB password can be left blank
+    db_input high diaspora-common/dbpass || true
+    db_go
+
     # source dbconfig-common shell library, and call the hook function
-    if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
-       . /usr/share/dbconfig-common/dpkg/config.pgsql
+    if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+       . /usr/share/dbconfig-common/dpkg/config
 
+       dbc_dbtypes="mysql, pgsql"
        dbc_dbname="diaspora_production"
        dbc_dbuser="diaspora"
 
-       dbc_go diaspora-common $@
+       dbc_go diaspora-common "$@"
     fi
 fi

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