update init scripts

diff --git a/debian/changelog b/debian/changelog
index 13018be..e2955a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-database (0.2.8~glasgall13) precise; urgency=low
+
+  * postgres is now started by just /etc/init.d/postgresql rather 
+    than a versioned init script.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Tue, 07 May 2013 17:13:19 -0400
+

 invirt-database (0.2.8~glasgall12) precise; urgency=low
 
   * More sqlalchemy api changes.
 invirt-database (0.2.8~glasgall12) precise; urgency=low
 
   * More sqlalchemy api changes.

diff --git a/debian/invirt-database-server.install b/debian/invirt-database-server.install
index 20459f2..23379ce 100644 (file)
--- a/debian/invirt-database-server.install
+++ b/debian/invirt-database-server.install
@@ -1,4 +1,4 @@
-postgresql-8.4.invirt etc/init.d
+postgresql.invirt etc/init.d

 debian/postgresql.conf.invirt etc/postgresql/8.4/main
 pg_hba.conf.mako etc/postgresql/8.4/main
 invirt-database-tables usr/bin
 debian/postgresql.conf.invirt etc/postgresql/8.4/main
 pg_hba.conf.mako etc/postgresql/8.4/main
 invirt-database-tables usr/bin

diff --git a/debian/invirt-database-server.postinst b/debian/invirt-database-server.postinst
index 903e64e..d9a0e3d 100644 (file)
--- a/debian/invirt-database-server.postinst
+++ b/debian/invirt-database-server.postinst
@@ -39,7 +39,7 @@ case "$1" in
        if ! getent passwd invirt >/dev/null 2>&1; then
            adduser --system invirt
        fi
        if ! getent passwd invirt >/dev/null 2>&1; then
            adduser --system invirt
        fi

-       invoke-rc.d postgresql-8.4 restart
+       invoke-rc.d postgresql restart

         su invirt -s /bin/sh -c 'invirt-database-tables create'
     ;;
 
         su invirt -s /bin/sh -c 'invirt-database-tables create'
     ;;
 

diff --git a/debian/rules b/debian/rules
index cda620a..39b0829 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ DEB_DIVERT_EXTENSION = .invirt
 
 DEB_DIVERT_FILES_invirt-database-server += \
        /etc/postgresql/8.4/main/postgresql.conf.invirt \
 
 DEB_DIVERT_FILES_invirt-database-server += \
        /etc/postgresql/8.4/main/postgresql.conf.invirt \

-       /etc/init.d/postgresql-8.4.invirt
+       /etc/init.d/postgresql.invirt

 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk

diff --git a/postgresql-8.4.invirt b/postgresql.invirt
similarity index 82%
rename from postgresql-8.4.invirt
rename to postgresql.invirt
index 0d4409a..a0be5ce 100755 (executable)
--- a/postgresql-8.4.invirt
+++ b/postgresql.invirt
@@ -16,12 +16,12 @@
 
 case "$1" in
   restart)
 
 case "$1" in
   restart)

-        invoke-rc.d postgresql-8.4.invirt-orig stop
-        invoke-rc.d postgresql-8.4.invirt-orig start
+        invoke-rc.d postgresql.invirt-orig stop
+        invoke-rc.d postgresql.invirt-orig start

         exit $?
        ;;
   *)
         exit $?
        ;;
   *)

-        invoke-rc.d postgresql-8.4.invirt-orig "$1"
+        invoke-rc.d postgresql.invirt-orig "$1"

         exit $?
        ;;
 esac
         exit $?
        ;;
 esac