[DRE-commits] [diaspora-installer] 02/06: edit diaspora_conf_private

[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 5892ec115308b0f32ab092f327d8efc38d4f3f00
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Aug 28 21:31:44 2016 +0530

    edit diaspora_conf_private
---
 debian/diaspora-common.postinst | 4 ++--
 grantpriv.sh                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/diaspora-common.postinst b/debian/diaspora-common.postinst
index 7e7ea6e..4eb9ffa 100755
--- a/debian/diaspora-common.postinst
+++ b/debian/diaspora-common.postinst
@@ -130,11 +130,11 @@ case "$1" in
                     echo export SERVICES_WORDPRESS_SECRET=$wordpress_secret >> ${diaspora_conf_private}
                 fi
             fi
+            ${diaspora_scripts}/adduser.sh
+            ${diaspora_scripts}/grantpriv.sh
 	    echo "Registering ${diaspora_conf} via ucf"
             ucf --debconf-ok --three-way ${diaspora_conf_private} ${diaspora_conf}
             ucfr diaspora-common ${diaspora_conf}
-            ${diaspora_scripts}/adduser.sh
-            ${diaspora_scripts}/grantpriv.sh
             ucf --debconf-ok --three-way ${diaspora_database_yml_private} ${diaspora_database_yml}
             ucfr diaspora-common ${diaspora_database_yml}
             mkdir -p ${diaspora_nginx_log}
diff --git a/grantpriv.sh b/grantpriv.sh
index cc7e328..0373869 100755
--- a/grantpriv.sh
+++ b/grantpriv.sh
@@ -13,8 +13,8 @@ cp ${diaspora_database_yml_example} ${diaspora_database_yml_private}
 
 if [ "$dbc_dbtype" = "mysql" ]; then
   # Switch to mysql adapter, ugly hack, see #818863
-  sed -i 's/DB=postgres/DB=mysql/' ${diaspora_conf}
-  sed -i 's/BUNDLE_WITH=postgresql/BUNDLE_WITH=mysql/' ${diaspora_conf}
+  sed -i 's/DB=postgres/DB=mysql/' ${diaspora_conf_private}
+  sed -i 's/BUNDLE_WITH=postgresql/BUNDLE_WITH=mysql/' ${diaspora_conf_private}
   sed -i 's/\# <<: \*mysql/<<: \*mysql/' ${diaspora_database_yml_private}
   sed -i 's/<<: \*postgres/\# <<: \*postgres/' ${diaspora_database_yml_private}
   sed -i "1,10s/password: \"\"/password: \"$dbc_dbpass\"/" ${diaspora_database_yml_private}

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