Index: /trunk/packages/sipb-xen-database/sipb-xen-database/debian/changelog
===================================================================
--- /trunk/packages/sipb-xen-database/sipb-xen-database/debian/changelog	(revision 80)
+++ /trunk/packages/sipb-xen-database/sipb-xen-database/debian/changelog	(revision 81)
@@ -1,2 +1,8 @@
+sipb-xen-database (2) unstable; urgency=low
+
+  * Fix the postinit and prerm scripts to create a sipb-xen user
+
+ -- Nelson Elhage <nelhage@mit.edu>  Thu, 16 Aug 2007 16:27:36 -0400
+
 sipb-xen-database (1) unstable; urgency=low
 
Index: /trunk/packages/sipb-xen-database/sipb-xen-database/debian/control.in
===================================================================
--- /trunk/packages/sipb-xen-database/sipb-xen-database/debian/control.in	(revision 80)
+++ /trunk/packages/sipb-xen-database/sipb-xen-database/debian/control.in	(revision 81)
@@ -15,5 +15,5 @@
 Package: sipb-xen-database-server
 Architecture: all
-Depends: ${misc:Depends}, postgresql-8.1, python-sqlalchemy, python-psycopg2, sipb-xen-database-common
+Depends: ${misc:Depends}, ${python:Depends}, postgresql-8.1, python-sqlalchemy, python-psycopg2, sipb-xen-database-common
 Description: Installs the SIPB Xen database server
  This tracks all the user VMs and is accessed from the VM host
Index: /trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.postinst
===================================================================
--- /trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.postinst	(revision 80)
+++ /trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.postinst	(revision 81)
@@ -24,23 +24,7 @@
         su postgres -c 'createuser sipb-xen -S -d -R'    || true
         su postgres -c 'createdb sipb_xen -O sipb-xen'   || true
-        PG_HBA=/etc/postgresql/8.1/main/pg_hba.conf
-        perl -ni -e 'print unless /^# ===BEGIN ADDED BY sipb-xen-dabase server$/ ..
-                                  /^# ===END ADDED BY sipb-xen-dabase server$/' \
-                                  "$PG_HBA"
-        cat<<EOF >> "$PG_HBA"
-# ===BEGIN ADDED BY sipb-xen-dabase server
-# DO NOT EDIT
-host    sipb_xen    sipb-xen    127.0.0.1/32          trust
-local   sipb_xen    sipb-xen                          trust
-# ===END ADDED BY sipb-xen-dabase server
-EOF
+        adduser --system sipb-xen
 
-        if hash invoke-rc.d; then
-            invoke-rc.d postgresql-8.1 restart
-        else
-            /etc/init.d/postgresql-8.1 restart
-        fi
-
-        sipb-xen-database-tables create
+        su sipb-xen -s /bin/sh -c 'sipb-xen-database-tables create'
     ;;
 
Index: /trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.prerm
===================================================================
--- /trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.prerm	(revision 80)
+++ /trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.prerm	(revision 81)
@@ -24,14 +24,5 @@
         # su postgres -c 'dropdb sipb_xen'
         # su postgres -c 'dropuser sipb-xen'
-        PG_HBA=/etc/postgresql/8.1/main/pg_hba.conf
-        perl -ni -e 'print unless /^# ===BEGIN ADDED BY sipb-xen-dabase server$/ ..
-                                  /^# ===END ADDED BY sipb-xen-dabase server$/' \
-                                  "$PG_HBA"
-
-        if hash invoke-rc.d; then
-            invoke-rc.d postgresql-8.1 restart
-        else
-            /etc/init.d/postgresql-8.1 restart
-        fi
+        deluser sipb-xen
     ;;
 
Index: /trunk/packages/sipb-xen-database/sipb-xen-database/sipb-xen-database-tables
===================================================================
--- /trunk/packages/sipb-xen-database/sipb-xen-database/sipb-xen-database-tables	(revision 80)
+++ /trunk/packages/sipb-xen-database/sipb-xen-database/sipb-xen-database-tables	(revision 81)
@@ -11,5 +11,5 @@
     usage()
 
-connect('postgres://sipb-xen@localhost/sipb_xen')
+connect('postgres://sipb-xen@/sipb_xen')
 
 if sys.argv[1] == "create":