[DRE-commits] [diaspora-installer] 08/20: add database.yml to ucf db

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

    add database.yml to ucf db
---
 debian/diaspora-common.postinst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 0febb77..b25c053 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -50,12 +50,9 @@ case "$1" in
         else
             # Show debconf questions
             . /usr/share/debconf/confmodule
-            . /usr/share/dbconfig-common/dpkg/postinst.pgsql
+            . /usr/share/dbconfig-common/dpkg/postinst
 
-            dbc_dbname="diaspora_production"
-            dbc_dbuser="diaspora"
-
-            dbc_go diaspora-common $@
+            dbc_go diaspora-common "$@"
 
             # Get ssl choice
             db_get diaspora-common/ssl
@@ -129,6 +126,8 @@ case "$1" in
             fi
             ucf --debconf-ok ${diaspora_conf} /etc/diaspora.conf
             ucfr diaspora-common /etc/diaspora.conf
+            ucf --debconf-ok ${diaspora_database_yml} /etc/diaspora/database.yml
+            ucfr diaspora-common /etc/diaspora/database.yml
             ${diaspora_scripts}/adduser.sh
             ${diaspora_scripts}/grantpriv.sh
             mkdir -p ${diaspora_nginx_log}

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