[pkg-dspam-commits] r68 - in trunk/debian: . sqlfiles

[Matthijs Mohlmann]

Author: active2-guest
Date: Fri Jan 13 22:36:21 2006
New Revision: 68

Added:
   trunk/debian/sqlfiles/pgsql-dbadmin
Modified:
   trunk/debian/libdspam7-drv-pgsql.config
   trunk/debian/libdspam7-drv-pgsql.dirs
   trunk/debian/rules
   trunk/debian/sqlfiles/pgsql
Log:
 * Add "CREATE LANGEUAGE plpgsql" to the dspam database, otherwise postgresql
   backend will refuse to install
 * Install that file in the right place.
 * Install as dspam user, dbconfig-common supports only ident authentication.


Modified: trunk/debian/libdspam7-drv-pgsql.config
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.config	(original)
+++ trunk/debian/libdspam7-drv-pgsql.config	Fri Jan 13 22:36:21 2006
@@ -10,6 +10,9 @@
 # The questions that are asked are pretty important.
 export DEBIAN_PRIORITY=low
 
+# Request user otherwise installation will fail.
+dbc_dbuser="dspam"
+
 # Load dbconfig
 . /usr/share/dbconfig-common/dpkg/config.pgsql
 

Modified: trunk/debian/libdspam7-drv-pgsql.dirs
==============================================================================
--- trunk/debian/libdspam7-drv-pgsql.dirs	(original)
+++ trunk/debian/libdspam7-drv-pgsql.dirs	Fri Jan 13 22:36:21 2006
@@ -1,4 +1,5 @@
 etc/dspam/dspam.d
 usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
+usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin
 usr/share/lintian/overrides/
 usr/lib/dspam

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Fri Jan 13 22:36:21 2006
@@ -120,6 +120,9 @@
 	# Install configure.pl as /etc/dspam/webfrontend.conf
 	install -d -g root -m 755 -o root $(CURDIR)/debian/dspam-webfrontend/etc/dspam
 	cp build--tmp/webui/cgi-bin/configure.pl $(CURDIR)/debian/dspam-webfrontend/etc/dspam/webfrontend.conf
+	
+	# Install PostgreSQL data file
+	cp debian/sqlfiles/pgsql-dbadmin $(CURDIR)/debian/libdspam7-drv-pgsql/usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin/pgsql
 
 binary-indep: build install
 	dh_testdir -i

Modified: trunk/debian/sqlfiles/pgsql
==============================================================================
--- trunk/debian/sqlfiles/pgsql	(original)
+++ trunk/debian/sqlfiles/pgsql	Fri Jan 13 22:36:21 2006
@@ -1,4 +1,3 @@
-# Tables for postgresql
 CREATE TABLE dspam_token_data (
   uid smallint,
   token bigint,

Added: trunk/debian/sqlfiles/pgsql-dbadmin
==============================================================================
--- (empty file)
+++ trunk/debian/sqlfiles/pgsql-dbadmin	Fri Jan 13 22:36:21 2006
@@ -0,0 +1 @@
+CREATE LANGUAGE plpgsql;