From 1d0a39b8fa788b54834c9caa6576a6038a195d31 Mon Sep 17 00:00:00 2001
From: Nelson Elhage <nelhage@mit.edu>
Date: Thu, 16 Aug 2007 16:45:48 -0400
Subject: [PATCH] A new version with less broken init scripts

svn path=/trunk/packages/sipb-xen-database/sipb-xen-database/; revision=81
---
 debian/changelog                         |    6 ++++++
 debian/control.in                        |    2 +-
 debian/sipb-xen-database-server.postinst |   22 +++-------------------
 debian/sipb-xen-database-server.prerm    |   11 +----------
 sipb-xen-database-tables                 |    2 +-
 5 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9499058..f00e50b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
 
   * Initial Release.
diff --git a/debian/control.in b/debian/control.in
index 0b59ba0..91f4442 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Description: Installs the SIPB Xen database schema files
 
 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
 
diff --git a/debian/sipb-xen-database-server.postinst b/debian/sipb-xen-database-server.postinst
index ef5e29e..9d14353 100644
--- a/debian/sipb-xen-database-server.postinst
+++ b/debian/sipb-xen-database-server.postinst
@@ -23,25 +23,9 @@ case "$1" in
         # Don't fail if the user/database already exists
         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
-
-        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
+        adduser --system sipb-xen
+
+        su sipb-xen -s /bin/sh -c 'sipb-xen-database-tables create'
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/sipb-xen-database-server.prerm b/debian/sipb-xen-database-server.prerm
index b2936d4..40489f9 100644
--- a/debian/sipb-xen-database-server.prerm
+++ b/debian/sipb-xen-database-server.prerm
@@ -23,16 +23,7 @@ case "$1" in
         # This will destroy data -- do we want to do this?
         # 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
     ;;
 
     failed-upgrade)
diff --git a/sipb-xen-database-tables b/sipb-xen-database-tables
index f054616..537462a 100755
--- a/sipb-xen-database-tables
+++ b/sipb-xen-database-tables
@@ -10,7 +10,7 @@ def usage():
 if len(sys.argv) == 1:
     usage()
 
-connect('postgres://sipb-xen@localhost/sipb_xen')
+connect('postgres://sipb-xen@/sipb_xen')
 
 if sys.argv[1] == "create":
     meta.create_all()
-- 
1.7.9.5