Changeset 974

Timestamp:

Oct 1, 2008, 2:10:33 AM (16 years ago)

Author:

price

Message:

port to postgresql 8.3

Location:

trunk/packages/sipb-xen-database

Files:

• debian/changelog (modified) (1 diff)
• debian/control (modified) (2 diffs)
• debian/rules (modified) (1 diff)
• debian/sipb-xen-database-server.init (modified) (1 diff)
• debian/sipb-xen-database-server.postinst (modified) (1 diff)
• server/etc/postgresql/8.3 (moved) (moved from trunk/packages/sipb-xen-database/server/etc/postgresql/8.1)
• server/etc/postgresql/8.3/main/postgresql.conf.invirt (modified) (1 diff)

trunk/packages/sipb-xen-database/debian/changelog

@@ +1 @@
+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
 

trunk/packages/sipb-xen-database/debian/control

@@ -15 +15 @@
 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
@@ -21 +21 @@
 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

trunk/packages/sipb-xen-database/debian/rules

@@ -4 +4 @@
 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
 
 

trunk/packages/sipb-xen-database/debian/sipb-xen-database-server.init

@@ -38 +38 @@
 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

trunk/packages/sipb-xen-database/debian/sipb-xen-database-server.postinst

@@ -36 +36 @@
             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'
     ;;

trunk/packages/sipb-xen-database/server/etc/postgresql/8.3/main/postgresql.conf.invirt

@@ -34 +34 @@
 
 #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