[pkg-dspam-commits] r52 - in trunk/debian: . config
Matthijs Mohlmann
active2-guest at costa.debian.org
Sat Nov 19 15:37:57 UTC 2005
Author: active2-guest
Date: Sat Nov 19 15:37:56 2005
New Revision: 52
Modified:
trunk/debian/changelog
trunk/debian/config/mysql.conf
trunk/debian/config/pgsql.conf
trunk/debian/libdspam7-drv-mysql.config
trunk/debian/libdspam7-drv-mysql.postinst
trunk/debian/libdspam7-drv-pgsql.config
trunk/debian/libdspam7-drv-pgsql.postinst
Log:
* Removed all the comments from debian/changelog (if someone wants them they
can get them from svn)
* Updated the template files for dbconfig-generate-include.
* Updated the postinst so that the config is installed in the right place
with use of dbconfig-generate-include
* DEBCONF_PRIORITY=low because there are pretty important questions asked and
the dbconfig-common maintainers don't think so.
* No upload yet because there is a stupid bug in dbconfig-generate-include that
disallows the use of ucf. (Bug already filed and patch submitted)
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Sat Nov 19 15:37:56 2005
@@ -1,31 +1,5 @@
dspam (3.6.0-1) unstable; urgency=low
- * Changes into dspam.conf :
- * Fix path to mysql socket
- * "opt in" instead of "opt out"
- * Spamaction=tag instead of quarantine
- * [aurelien] added manpages
- * [aurelien] fix webfrontend files to fit Debian installation (patch added)
- * [aurelien] fix apache 1.3 configuration for webfrontend
- * [kbk] modify webfrontend.dirs to .../dspam-webfrontend/...
- * [kbk] modify some permissions to eliminate lintian complaints
- * [kbk] spam-webfrontend-config-debian.dpatch missing, comment out in 00list
- * [kbk] minor cleanup on rules whitespace, fix --enable-debug option typo
- * [aurelien] commited spam-webfrontend-config-debian.dpatch and reactivate
- it in 00list
- * [mooch] erased duplicated configure entries.
- * [aurelien] change directories name for dspam-webfrontend. become simply
- 'dspam' rather than 'dspam-webfrontend'
- * [aurelien] renamed configure.pl to configure.conf to avoid lintian warning
- * [aurelien] changes webfrontend template location from
- /usr/share/dspam/templates to /usr/share/dspam/upstream-templates and
- change default template directory.
- Added a small text file to explain how to configure templates.
- * [aurelien] updated dspam-webfrontend patch to install default.prefs only
- in /etc/dspam
- * [aurelien] bumped Debian's standard version to 3.6.2.1
- * [aurelien] added a patch to allow dspam to find .txt files (first spam,
- ..etc)
- * [aurelien] Fix blank history cgi page (patch added)
+ * Initial release. (Closes: #195948)
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org> Fri, 4 Nov 2005 19:37:29 +0100
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org> Sat, 19 Nov 2005 16:33:56 +0100
Modified: trunk/debian/config/mysql.conf
==============================================================================
--- trunk/debian/config/mysql.conf (original)
+++ trunk/debian/config/mysql.conf Sat Nov 19 15:37:56 2005
@@ -4,14 +4,15 @@
# Storage driver settings: Specific to a particular storage driver. Uncomment
# the configuration specific to your installation, if applicable.
#
-#MySQLServer /var/run/mysqld/mysqld.sock
-#MySQLPort
-#MySQLUser dspam
-#MySQLPass changeme
-#MySQLDb dspam
+MySQLServer _DBC_DBSERVER_
+MySQLPort _DBC_DBPORT_
+MySQLUser _DBC_DBUSER_
+MySQLPass _DBC_DBPASS_
+MySQLDb _DBC_DBNAME_
#MySQLCompress false
# Use this if you have the 4.1 quote bug (see doc/mysql.txt)
+# mysql-server-4.1 version => 4.1.15-1 doesn't have this bug.
#MySQLSupressQuote on
# If you're running DSPAM in client/server (daemon) mode, uncomment the
Modified: trunk/debian/config/pgsql.conf
==============================================================================
--- trunk/debian/config/pgsql.conf (original)
+++ trunk/debian/config/pgsql.conf Sat Nov 19 15:37:56 2005
@@ -1,10 +1,10 @@
# --- PostgreSQL ---
-#PgSQLServer 127.0.0.1
-#PgSQLPort 5432
-#PgSQLUser dspam
-#PgSQLPass changeme
-#PgSQLDb dspam
+PgSQLServer _DBC_DBSERVER_
+PgSQLPort _DBC_DBPORT_
+PgSQLUser _DBC_DBUSER_
+PgSQLPass _DBC_DBPASS_
+PgSQLDb _DBC_DBNAME_
# If you're running DSPAM in client/server (daemon) mode, uncomment the
# setting below to override the default connection cache size (the number
Modified: trunk/debian/libdspam7-drv-mysql.config
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.config (original)
+++ trunk/debian/libdspam7-drv-mysql.config Sat Nov 19 15:37:56 2005
@@ -7,6 +7,9 @@
# Load debconf
. /usr/share/debconf/confmodule
+# The questions that are asked are pretty important.
+export DEBIAN_PRIORITY=low
+
# Load dbconfig
. /usr/share/dbconfig-common/dpkg/config.mysql
Modified: trunk/debian/libdspam7-drv-mysql.postinst
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.postinst (original)
+++ trunk/debian/libdspam7-drv-mysql.postinst Sat Nov 19 15:37:56 2005
@@ -15,38 +15,11 @@
case "$1" in
configure)
- # Create default config.
- MYSQLCONFTEMP=`mktemp`
- cat /usr/share/doc/libdspam7-drv-mysql/mysql.conf > $MYSQLCONFTEMP
-
- # Load config coming from dbconfig-common
- . /etc/dbconfig-common/libdspam7-drv-mysql.conf
-
- # Edit default config with parameters from dbconfig-common if
- # dbconfig-common was used to create databases.
+ # Check if user wants that we generate a config.
if [ "$dbc_install" = "true" ]; then
- if [ ! -z "$dbc_dbserver" ]; then
- sed -i -e "s|^\(#\)\?\(# \)\?MySQLServer.*$|MySQLServer $dbc_dbserver|" $MYSQLCONFTEMP
- else
- sed -i -e "s|^\(#\)\?\(# \)\?MySQLServer|MySQLServer|" $MYSQLCONFTEMP
- fi
-
- # If not set, use default.
- if [ ! -z "$dbc_dbport" ]; then
- sed -i -e "s|^\(#\)\?\(# \)\?MySQLPort.*$|MySQLPort $dbc_dbport|" $MYSQLCONFTEMP
- fi
- # dbc_dbuser, dbc_dbpass, dbc_dbname should be set otherwise
- # dbconfig-common isn't able to do anything.
- sed -i -e "s|^\(#\)\?\(# \)\?MySQLUser.*$|MySQLUser $dbc_dbuser|" $MYSQLCONFTEMP
- sed -i -e "s|^\(#\)\?\(# \)\?MySQLPass.*$|MySQLPass $dbc_dbpass|" $MYSQLCONFTEMP
- sed -i -e "s|^\(#\)\?\(# \)\?MySQLDb.*$|MySQLDb $dbc_dbname|" $MYSQLCONFTEMP
+ # 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
-
- # Install the configuration file
- ucf $MYSQLCONFTEMP /etc/dspam/dspam.d/mysql.conf
-
- # Clean up temp files.
- rm -f $MYSQLCONFTEMP
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
Modified: trunk/debian/libdspam7-drv-pgsql.config
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.config (original)
+++ trunk/debian/libdspam7-drv-pgsql.config Sat Nov 19 15:37:56 2005
@@ -7,6 +7,9 @@
# Load debconf
. /usr/share/debconf/confmodule
+# The questions that are asked are pretty important.
+export DEBIAN_PRIORITY=low
+
# Load dbconfig
. /usr/share/dbconfig-common/dpkg/config.pgsql
Modified: trunk/debian/libdspam7-drv-pgsql.postinst
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.postinst (original)
+++ trunk/debian/libdspam7-drv-pgsql.postinst Sat Nov 19 15:37:56 2005
@@ -15,38 +15,10 @@
case "$1" in
configure)
- # Create default config.
- PGSQLCONFTEMP=`mktemp`
- cat /usr/share/doc/libdspam7-drv-pgsql/pgsql.conf > $PGSQLCONFTEMP
-
- # Load config coming from dbconfig-common
- . /etc/dbconfig-common/libdspam7-drv-pgsql.conf
-
- # Edit default config with parameters from dbconfig-common if
- # dbconfig-common was used to create databases.
if [ "$dbc_install" = "true" ]; then
- if [ ! -z "$dbc_dbserver" ]; then
- sed -i -e "s|^\(#\)\?\(# \)\?PgSQLServer.*$|PgSQLServer $dbc_dbserver|" $PGSQLCONFTEMP
- else
- sed -i -e "s|^\(#\)\?\(# \)\?PgSQLServer|PgSQLServer|" $PGSQLCONFTEMP
- fi
-
- # If not set, use default.
- if [ ! -z "$dbc_dbport" ]; then
- sed -i -e "s|^\(#\)\?\(# \)\?PgSQLPort.*$|PgSQLPort $dbc_dbport|" $PGSQLCONFTEMP
- fi
- # dbc_dbuser, dbc_dbpass, dbc_dbname should be set otherwise
- # dbconfig-common isn't able to do anything.
- sed -i -e "s|^\(#\)\?\(# \)\?PgSQLUser.*$|PgSQLUser $dbc_dbuser|" $PGSQLCONFTEMP
- sed -i -e "s|^\(#\)\?\(# \)\?PgSQLPass.*$|PgSQLPass $dbc_dbpass|" $PGSQLCONFTEMP
- sed -i -e "s|^\(#\)\?\(# \)\?PgSQLDb.*$|PgSQLDb $dbc_dbname|" $PGSQLCONFTEMP
+ # 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
-
- # Install the configuration file
- ucf $PGSQLCONFTEMP /etc/dspam/dspam.d/pgsql.conf
-
- # Clean up temp files.
- rm -f $PGSQLCONFTEMP
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
More information about the Pkg-dspam-commits
mailing list