[Pkg-dspam-commits] [pkg-dspam-commits] r222 - in branches/experimental/debian: . config
Julien Valroff
julien-guest at alioth.debian.org
Mon Dec 28 17:21:38 UTC 2009
Author: julien-guest
Date: Mon Dec 28 17:21:38 2009
New Revision: 222
Log:
Updated splitted configuration files
Modified:
branches/experimental/debian/changelog
branches/experimental/debian/config/extlookup.conf
branches/experimental/debian/config/mysql.conf
branches/experimental/debian/config/pgsql.conf
branches/experimental/debian/config/sqlite.conf
branches/experimental/debian/rules
Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog Sat Dec 19 15:31:37 2009 (r221)
+++ branches/experimental/debian/changelog Mon Dec 28 17:21:38 2009 (r222)
@@ -1,4 +1,4 @@
-dspam (3.9.0~rc2-2) experimental; urgency=low
+dspam (3.9.0~rc2-1) experimental; urgency=low
[ Kurt B. Kaiser ]
* debian/rules: don't use --build config option if host equals target.
@@ -70,7 +70,7 @@
* Update dspam_admin manpage to list aggregate feature
* Makes drv-sqlite3 daily cronjob quiet if package is removed and
not purged - thanks to Petter Reinholdtsen <pere at hungry.com>
- (Closes: #540064)
+ (Closes: #540064, #562857)
* Converted source package to 3.0 (quilt) format
-- Julien Valroff <julien at kirya.net> Sat, 19 Dec 2009 12:31:05 +0100
Modified: branches/experimental/debian/config/extlookup.conf
==============================================================================
--- branches/experimental/debian/config/extlookup.conf Sat Dec 19 15:31:37 2009 (r221)
+++ branches/experimental/debian/config/extlookup.conf Mon Dec 28 17:21:38 2009 (r222)
@@ -38,3 +38,5 @@
#ExtLookupLogin "cn=admin,dc=domain,dc=com" # Login to be used when connecting to any direct database backend.
#ExtLookupPassword itsasecret # Password to use with ExtLookupLogin.
#ExtLookupCrypto tls # Sets the use of TLS on backend communication (only compatible with LDAPv3)
+
+
Modified: branches/experimental/debian/config/mysql.conf
==============================================================================
--- branches/experimental/debian/config/mysql.conf Sat Dec 19 15:31:37 2009 (r221)
+++ branches/experimental/debian/config/mysql.conf Mon Dec 28 17:21:38 2009 (r222)
@@ -4,35 +4,32 @@
# 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 3306
-MySQLUser _DBC_DBUSER_
-MySQLPass _DBC_DBPASS_
-MySQLDb _DBC_DBNAME_
-#MySQLCompress false
-#MySQLReconnect true
+#MySQLServer /var/run/mysqld/mysqld.sock
+#MySQLPort 3306
+#MySQLUser _DBC_DBUSER_
+#MySQLPass _DBC_DBPASS_
+#MySQLDb _DBC_DBNAME_
+#MySQLCompress true
+#MySQLReconnect true
# If you are using replication for clustering, you can also specify a separate
# server to perform all writes to.
#
-#MySQLWriteServer /var/run/mysqld/mysqld.sock
-#MySQLWritePort 3306
-#MySQLWriteUser dspam
-#MySQLWritePass changeme
-#MySQLWriteDb dspam_write
-#MySQLCompress true
-#MySQLReconnect true
+#MySQLWriteServer /var/run/mysqld/mysqld.sock
+#MySQLWritePort 3306
+#MySQLWriteUser dspam
+#MySQLWritePass changeme
+#MySQLWriteDb dspam_write
+#MySQLCompress true
+#MySQLReconnect true
-# If your replication isn't close to real-time, your retraining might fail if
+# If your replication isn't close to real-time, your retraining might fail if
# the signature isn't found. One workaround for this is to use the write
# database for all signature reads:
#
-#MySQLReadSignaturesFromWriteDb on
+#MySQLReadSignaturesFromWriteDb on
# 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.
-# This bug doesn't apply to debian mysql server, it is already fixed in the
-# mysql packages.
#MySQLSupressQuote on
# If you're running DSPAM in client/server (daemon) mode, uncomment the
@@ -49,14 +46,14 @@
# change the table dspam uses to perform username/uid lookups, you can over-
# ride it below
-#MySQLVirtualTable dspam_virtual_uids
-#MySQLVirtualUIDField uid
-#MySQLVirtualUsernameField username
+#MySQLVirtualTable dspam_virtual_uids
+#MySQLVirtualUIDField uid
+#MySQLVirtualUsernameField username
# UIDInSignature: MySQL supports the insertion of the user id into the DSPAM
# signature. This allows you to create one single spam or fp alias
# (pointing to some arbitrary user), and the uid in the signature will
# switch to the correct user. Result: you need only one spam alias
-#MySQLUIDInSignature on
+#MySQLUIDInSignature on
Modified: branches/experimental/debian/config/pgsql.conf
==============================================================================
--- branches/experimental/debian/config/pgsql.conf Sat Dec 19 15:31:37 2009 (r221)
+++ branches/experimental/debian/config/pgsql.conf Mon Dec 28 17:21:38 2009 (r222)
@@ -1,10 +1,14 @@
# --- PostgreSQL ---
-PgSQLServer 127.0.0.1
-#PgSQLPort 5432
-PgSQLUser _DBC_DBUSER_
-PgSQLPass _DBC_DBPASS_
-PgSQLDb _DBC_DBNAME_
+# For PgSQLServer you can Use a TCP/IP address or a socket. If your socket is
+# in /var/run/postgresql/.s.PGSQL.5432 specify just the path where the socket
+# resits (without .s.PGSQL.5432).
+
+#PgSQLServer 127.0.0.1
+#PgSQLPort 5432
+#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
@@ -17,13 +21,13 @@
# (pointing to some arbitrary user), and the uid in the signature will
# switch to the correct user. Result: you need only one spam alias
-#PgSQLUIDInSignature on
+#PgSQLUIDInSignature on
# If you're using vpopmail or some other type of virtual setup and wish to
# change the table dspam uses to perform username/uid lookups, you can over-
# ride it below
-#PgSQLVirtualTable dspam_virtual_uids
-#PgSQLVirtualUIDField uid
-#PgSQLVirtualUsernameField username
+#PgSQLVirtualTable dspam_virtual_uids
+#PgSQLVirtualUIDField uid
+#PgSQLVirtualUsernameField username
Modified: branches/experimental/debian/config/sqlite.conf
==============================================================================
--- branches/experimental/debian/config/sqlite.conf Sat Dec 19 15:31:37 2009 (r221)
+++ branches/experimental/debian/config/sqlite.conf Mon Dec 28 17:21:38 2009 (r222)
@@ -1,4 +1,4 @@
# --- SQLite ---
-#SQLitePragma "synchronous = OFF"
+#SQLitePragma "synchronous = OFF"
Modified: branches/experimental/debian/rules
==============================================================================
--- branches/experimental/debian/rules Sat Dec 19 15:31:37 2009 (r221)
+++ branches/experimental/debian/rules Mon Dec 28 17:21:38 2009 (r222)
@@ -86,6 +86,12 @@
cat src/tools.pgsql_drv/pgsql_objects.sql > debian/sqlfiles/pgsql
cat src/tools.pgsql_drv/virtual_users.sql >> debian/sqlfiles/pgsql
+ # could we do something automatic for file splitting?
+ # awk '/^# -- ExtLookup --$/ , /^# -- Profiles --$/' src/dspam.conf.in | sed '$d' > debian/config/extlookup.conf
+ # awk '/^# --- SQLite ---$/ , /^# --- Hash ---$/' src/dspam.conf.in | sed '$d' > debian/config/sqlite.conf
+ # awk '/^# --- MySQL ---$/ , /^# --- PostgreSQL ---$/' src/dspam.conf.in | sed '$d' > debian/config/mysql.conf
+ # awk '/^# --- PostgreSQL ---$/ , /^# --- SQLite ---$/' src/dspam.conf.in | sed '$d' > debian/config/pgsql.conf
+
touch build-stamp
clean:
@@ -93,9 +99,6 @@
dh_testroot
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) maintainer-clean
- # maintainer-clean doesn't catch all the Makefile.in:
- #find -type f \( -name Makefile.in \) -print0 | xargs -0 rm -f
- #rm -f config.guess config.sub
# Remove DB schemas
rm -f debian/sqlfiles/pgsql debian/sqlfiles/mysql
More information about the Pkg-dspam-commits
mailing list