Move dbconfig postinst settings to within the dbconfig block

diff --git a/debian/scalable-opengroupware.org.postinst b/debian/scalable-opengroupware.org.postinst
index 9e1b9a8dec6f34a0fdcf433f39fe1c8fda0da388..13c28e64c422bf45c0c0a5655190f068da600e4d 100644 (file)
--- a/debian/scalable-opengroupware.org.postinst
+++ b/debian/scalable-opengroupware.org.postinst
@@ -10,15 +10,16 @@ if [ -z "$2" ]; then
     install -d -o sogo /var/log/sogo
     install -d -o sogo $SOGOHOME/GNUstep/Defaults
 
-    dbc_generate_include=template:/etc/scalable-opengroupware.org/config
-    dbc_generate_include_owner=sogo
-    dbc_generate_include_perms=0600
-    dbc_pgsql_createdb_encoding=UTF8
-    dbc_authmethod_user=password
-    dbc_generate_include_args="-f template"
-
     if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
        . /usr/share/dbconfig-common/dpkg/postinst.pgsql
+
+       dbc_generate_include=template:/etc/scalable-opengroupware.org/config
+       dbc_generate_include_owner=sogo
+       dbc_generate_include_perms=0600
+       dbc_pgsql_createdb_encoding=UTF8
+       dbc_authmethod_user=password
+       dbc_generate_include_args="-o template_infile=/var/lib/scalable-opengroupware.org/gnustepdefaults.template"
+
        dbc_go scalable-opengroupware.org "$@"
     fi
     ln -s /etc/scalable-opengroupware.org/config $SOGOHOME/GNUstep/Defaults/.GNUstepDefaults