[pkg-dspam-commits] r54 - in trunk/debian: . config

[Matthijs Mohlmann]

Author: active2-guest
Date: Tue Nov 22 22:24:54 2005
New Revision: 54

Modified:
   trunk/debian/config/mysql.conf
   trunk/debian/config/pgsql.conf
   trunk/debian/libdspam7-drv-mysql.postinst
   trunk/debian/libdspam7-drv-pgsql.postinst
Log:
 * Updated the config to always use localhost because dbconfig-generate-include
   doesn't update them (it doesn't replace _DBC_DBSERVER_ and _DBC_DBPORT_)
 * Updated the postinst to be a bit more efficient.


Modified: trunk/debian/config/mysql.conf
==============================================================================
--- trunk/debian/config/mysql.conf	(original)
+++ trunk/debian/config/mysql.conf	Tue Nov 22 22:24:54 2005
@@ -4,8 +4,8 @@
 # Storage driver settings: Specific to a particular storage driver. Uncomment
 # the configuration specific to your installation, if applicable.
 #
-MySQLServer       _DBC_DBSERVER_
-MySQLPort         _DBC_DBPORT_
+MySQLServer       /var/run/mysql/mysqld.sock
+#MySQLPort         3306
 MySQLUser         _DBC_DBUSER_
 MySQLPass         _DBC_DBPASS_
 MySQLDb           _DBC_DBNAME_

Modified: trunk/debian/config/pgsql.conf
==============================================================================
--- trunk/debian/config/pgsql.conf	(original)
+++ trunk/debian/config/pgsql.conf	Tue Nov 22 22:24:54 2005
@@ -1,7 +1,7 @@
 # --- PostgreSQL ---
 
-PgSQLServer    	_DBC_DBSERVER_
-PgSQLPort      	_DBC_DBPORT_
+PgSQLServer    	127.0.0.1
+#PgSQLPort       5432
 PgSQLUser      	_DBC_DBUSER_
 PgSQLPass      	_DBC_DBPASS_
 PgSQLDb        	_DBC_DBNAME_

Modified: trunk/debian/libdspam7-drv-mysql.postinst
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.postinst	(original)
+++ trunk/debian/libdspam7-drv-mysql.postinst	Tue Nov 22 22:24:54 2005
@@ -10,16 +10,15 @@
 # Load dbconfig (mysql part)
 . /usr/share/dbconfig-common/dpkg/postinst.mysql
 
+# Set some variables
+dbc_generate_include=template:/etc/dspam/dspam.d/mysql.conf
+dbc_generate_include_args="-U -o template_infile='/usr/share/doc/libdspam7-drv-mysql/mysql.conf'"
+
 # Run dbconfig
 dbc_go libdspam7-drv-mysql $@
 
 case "$1" in
   configure)
-    # Check if user wants that we generate a config.
-    if [ "$dbc_install" = "true" ]; then
-      # Create default config.
-      dbconfig-generate-include -f template -U -o template_infile=/usr/share/doc/libdspam7-drv-mysql/mysql.conf /etc/dbconfig-common/libdspam7-drv-mysql.conf /etc/dspam/dspam.d/mysql.conf
-    fi
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;

Modified: trunk/debian/libdspam7-drv-pgsql.postinst
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.postinst	(original)
+++ trunk/debian/libdspam7-drv-pgsql.postinst	Tue Nov 22 22:24:54 2005
@@ -7,6 +7,10 @@
 # Load debconf
 . /usr/share/debconf/confmodule
 
+# Set some variables
+dbc_generate_include=template:/etc/dspam/dspam.d/mysql.conf
+dbc_generate_include_args="-U -o template_infile='/usr/share/doc/libdspam7-drv-mysql/mysql.conf'"
+
 # Load dbconfig (pgsql part)
 . /usr/share/dbconfig-common/dpkg/postinst.pgsql
 
@@ -15,10 +19,6 @@
 
 case "$1" in
   configure)
-    if [ "$dbc_install" = "true" ]; then
-      # Create default config.
-      dbconfig-generate-include -f template -U -o template_infile=/usr/share/doc/libdspam7-drv-pgsql/pgsql.conf /etc/dbconfig-common/libdspam7-drv-pgsql.conf /etc/dspam/dspam.d/pgsql.conf
-    fi
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;