Turns out sipb-xen-www's init script was the problem, not

apache's. Install a fix

svn path=/trunk/packages/sipb-xen-www/; revision=1047

diff --git a/debian/changelog b/debian/changelog
index 23c03ba..c86a8f7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-www (3.14.1) unstable; urgency=low
+
+  * Try again, now that I actually understand what the problem is
+
+ -- Evan Broder <broder@mit.edu>  Sat, 04 Oct 2008 23:58:46 -0400
+

 sipb-xen-www (3.14) unstable; urgency=low
 
   * Try to fix startup ordering problem by specifying that the new startup
 sipb-xen-www (3.14) unstable; urgency=low
 
   * Try to fix startup ordering problem by specifying that the new startup

diff --git a/debian/rules b/debian/rules
index bef8ef4..1c529e4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,5 +7,7 @@ DEB_DIVERT_FILES_sipb-xen-www += \
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/config-package.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/config-package.mk
 

+DEB_UPDATE_RCD_PARAMS_sipb-xen-www += defaults 91 9
+

 binary-fixup/sipb-xen-www::
        svn co $$(invirt-getconf svn.uri)/trunk/packages/sipb-xen-www/code/ $(DEB_DESTDIR)/var/www/sipb-xen-www
 binary-fixup/sipb-xen-www::
        svn co $$(invirt-getconf svn.uri)/trunk/packages/sipb-xen-www/code/ $(DEB_DESTDIR)/var/www/sipb-xen-www

diff --git a/debian/sipb-xen-www.postinst b/debian/sipb-xen-www.postinst
index 5ddf6f9..7f213a0 100755 (executable)
--- a/debian/sipb-xen-www.postinst
+++ b/debian/sipb-xen-www.postinst
@@ -24,6 +24,10 @@ case "$1" in
        make clean && make all
        chgrp -R sipb-xen .
        chmod -R g+w .
        make clean && make all
        chgrp -R sipb-xen .
        chmod -R g+w .

+        
+        # Our init script proxies all requests Apache's, so Apache's
+        # running is just a NOP
+        update-rc.d -f apache2 remove

     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)