From d6af243d1320e0b258a088ff33e262b41594ad44 Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Wed, 1 Oct 2008 02:10:33 -0400
Subject: [PATCH 1/1] port to postgresql 8.3

svn path=/trunk/packages/sipb-xen-database/; revision=974
---
 debian/changelog                                   |    6 ++++++
 debian/control                                     |    4 ++--
 debian/rules                                       |    2 +-
 debian/sipb-xen-database-server.init               |    2 +-
 debian/sipb-xen-database-server.postinst           |    4 ++--
 .../postgresql/{8.1 => 8.3}/main/pg_hba.conf.mako  |    0
 .../{8.1 => 8.3}/main/postgresql.conf.invirt       |    6 +++---
 7 files changed, 15 insertions(+), 9 deletions(-)
 rename server/etc/postgresql/{8.1 => 8.3}/main/pg_hba.conf.mako (100%)
 rename server/etc/postgresql/{8.1 => 8.3}/main/postgresql.conf.invirt (98%)

diff --git a/debian/changelog b/debian/changelog
index ffceb5c..24d4405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-database (10.23) unstable; urgency=low
+
+  * switch to postgresql 8.3, as 8.1 isn't in hardy
+
+ -- Greg Price <price@mit.edu>  Wed, 01 Oct 2008 02:09:43 -0400
+
 sipb-xen-database (10.22) unstable; urgency=low
 
   * depend on postgresql without specifying old version 8.1
diff --git a/debian/control b/debian/control
index 5a94d1e..cbd3229 100644
--- a/debian/control
+++ b/debian/control
@@ -14,13 +14,13 @@ Description: Installs the SIPB Xen database schema files
 
 Package: sipb-xen-database-server
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, postgresql, python-sqlalchemy, python-psycopg2, sipb-xen-database-common, adduser
+Depends: ${misc:Depends}, ${python:Depends}, postgresql-8.3, python-sqlalchemy, python-psycopg2, sipb-xen-database-common, adduser
 Description: Installs the SIPB Xen database server
  This tracks all the user VMs and is accessed from the VM host
 
 Package: sipb-xen-database-client
 Architecture: all
-Depends: ${misc:Depends}, postgresql-client, python-sqlalchemy, python-psycopg2, sipb-xen-database-common, python
+Depends: ${misc:Depends}, postgresql-client-8.3, python-sqlalchemy, python-psycopg2, sipb-xen-database-common, python
 Description: Installs the SIPB Xen database configuration file
  This is a python xen configuration script that talks to the database
  to dynamically load xen domU configuration information
diff --git a/debian/rules b/debian/rules
index 5a27b33..c797897 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 
 DEB_DIVERT_EXTENSION = .invirt
 DEB_DIVERT_FILES_sipb-xen-database-server += \
-/etc/postgresql/8.1/main/postgresql.conf.invirt
+/etc/postgresql/8.3/main/postgresql.conf.invirt
 
 
 include /usr/share/cdbs/1/rules/debhelper.mk
diff --git a/debian/sipb-xen-database-server.init b/debian/sipb-xen-database-server.init
index b4f805e..be4831b 100644
--- a/debian/sipb-xen-database-server.init
+++ b/debian/sipb-xen-database-server.init
@@ -37,7 +37,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 
 gen_config()
 {
-    for i in /etc/postgresql/8.1/main/pg_hba.conf
+    for i in /etc/postgresql/8.3/main/pg_hba.conf
              ; do
         mako-render $i.mako > $i
     done
diff --git a/debian/sipb-xen-database-server.postinst b/debian/sipb-xen-database-server.postinst
index faae517..cbc1061 100644
--- a/debian/sipb-xen-database-server.postinst
+++ b/debian/sipb-xen-database-server.postinst
@@ -35,8 +35,8 @@ case "$1" in
             su postgres -c 'createdb sipb_xen -O sipb-xen'   || true
             adduser --system sipb-xen
         fi
-	mako-render /etc/postgresql/8.1/main/pg_hba.conf.mako >/etc/postgresql/8.1/main/pg_hba.conf
-	/etc/init.d/postgresql-8.1 restart
+	mako-render /etc/postgresql/8.3/main/pg_hba.conf.mako >/etc/postgresql/8.3/main/pg_hba.conf
+	/etc/init.d/postgresql-8.3 restart
         su sipb-xen -s /bin/sh -c 'sipb-xen-database-tables create'
     ;;
 
diff --git a/server/etc/postgresql/8.1/main/pg_hba.conf.mako b/server/etc/postgresql/8.3/main/pg_hba.conf.mako
similarity index 100%
rename from server/etc/postgresql/8.1/main/pg_hba.conf.mako
rename to server/etc/postgresql/8.3/main/pg_hba.conf.mako
diff --git a/server/etc/postgresql/8.1/main/postgresql.conf.invirt b/server/etc/postgresql/8.3/main/postgresql.conf.invirt
similarity index 98%
rename from server/etc/postgresql/8.1/main/postgresql.conf.invirt
rename to server/etc/postgresql/8.3/main/postgresql.conf.invirt
index 0e8b0f8..9548b91 100644
--- a/server/etc/postgresql/8.1/main/postgresql.conf.invirt
+++ b/server/etc/postgresql/8.3/main/postgresql.conf.invirt
@@ -33,11 +33,11 @@
 # switch or PGDATA environment variable, represented here as ConfigDir.
 
 #data_directory = 'ConfigDir'		# use data in another directory
-hba_file = '/etc/postgresql/8.1/main/pg_hba.conf'	# host-based authentication file
-ident_file = '/etc/postgresql/8.1/main/pg_ident.conf'	# IDENT configuration file
+hba_file = '/etc/postgresql/8.3/main/pg_hba.conf'	# host-based authentication file
+ident_file = '/etc/postgresql/8.3/main/pg_ident.conf'	# IDENT configuration file
 
 # If external_pid_file is not explicitly set, no extra pid file is written.
-external_pid_file = '/var/run/postgresql/8.1-main.pid'		# write an extra pid file
+external_pid_file = '/var/run/postgresql/8.3-main.pid'		# write an extra pid file
 
 
 #---------------------------------------------------------------------------
-- 
1.7.9.5