add kstart apache wrapper; update control

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

diff --git a/debian/changelog b/debian/changelog
index e93b4b6..b71db84 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sipb-xen-www (3.6) unstable; urgency=low
+
+  * Add Anders' kstart-using apache2 init script.
+  * Add some dependencies the svn site needs.
+
+ -- Greg Price <price@mit.edu>  Mon, 28 Jul 2008 07:51:09 -0400
+

 sipb-xen-www (3.5) unstable; urgency=low
 
   * Use FCGI.
 sipb-xen-www (3.5) unstable; urgency=low
 
   * Use FCGI.

diff --git a/debian/control b/debian/control
index 66a8489..dbc37b1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,5 +7,6 @@ Standards-Version: 3.7.2
 
 Package: sipb-xen-www
 Architecture: all
 
 Package: sipb-xen-www
 Architecture: all

-Depends: ${misc:Depends}, libapache2-mod-fcgid, python-cheetah, python-simplejson, sipb-xen-database-common, sipb-xen-vnc-client
+Depends: ${misc:Depends}, libapache2-mod-fcgid, python-cheetah, python-simplejson, sipb-xen-database-common, sipb-xen-vnc-client, kstart,
+ libapache2-svn, postfix, subversion, zephyr-clients

 Description: Install the sipb-xen-dev website
 Description: Install the sipb-xen-dev website

diff --git a/debian/rules b/debian/rules
index 4ffbc7d..6d11e74 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,11 @@
 #!/usr/bin/make -f
 
 #!/usr/bin/make -f
 

+DEB_DIVERT_EXTENSION = .invirt
+DEB_DIVERT_FILES_sipb-xen-www += \
+    /etc/init.d/apache2
+

 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

+include /usr/share/cdbs/1/rules/config-package.mk

 
 binary-fixup/sipb-xen-www::
        svn co https://sipb-xen-dev.mit.edu:1111/trunk/packages/sipb-xen-www/code/ $(DEB_DESTDIR)/var/www/sipb-xen-www
 
 binary-fixup/sipb-xen-www::
        svn co https://sipb-xen-dev.mit.edu:1111/trunk/packages/sipb-xen-www/code/ $(DEB_DESTDIR)/var/www/sipb-xen-www

diff --git a/files/etc/init.d/apache2.invirt b/files/etc/init.d/apache2.invirt
new file mode 100755 (executable)
index 0000000..a017dc4
--- /dev/null
+++ b/files/etc/init.d/apache2.invirt
@@ -0,0 +1,53 @@
+#!/usr/bin/pagsh -e
+#
+# Apache kstart wrapper by anders.
+#
+
+SCRIPT=/etc/init.d/apache2.invirt-orig
+KSTART_PIDFILE=/var/run/k5start-apache2.pid
+KSTART_KEYTAB=/etc/apache2/keytab
+
+export AFSCELL=sipb.mit.edu
+
+kstart_start () {
+    TMP_PIDFILE=$(mktemp /tmp/k5start-apache2.pid-XXXXXX)
+    chown www-data "$TMP_PIDFILE"
+    export KRB5CCNAME=$(mktemp /tmp/krb5cc_33.kstart-XXXXXX)
+    chown www-data $KRB5CCNAME
+    /sbin/start-stop-daemon --start --pidfile "$TMP_PIDFILE" -c www-data \
+       --exec /usr/bin/k5start -- -b -p "$TMP_PIDFILE" \
+       -f "$KSTART_KEYTAB" -K10 -u daemon -i sipb-xen.mit.edu -S afs -I sipb.mit.edu -t -b
+    cat "$TMP_PIDFILE" >|"$KSTART_PIDFILE"
+    rm -f "$TMP_PIDFILE"
+}
+kstart_stop () {
+    if [ -e $KSTART_PIDFILE ]; then
+       /sbin/start-stop-daemon --stop --pidfile $KSTART_PIDFILE
+       rm -f $KSTART_PIDFILE
+    else
+       echo -n " ... no kstart pidfile"
+    fi
+}
+
+case "$1" in
+  start)
+    echo -n "Starting kstart for Apache2: k5start"
+    kstart_start
+    echo "."
+    exec "$SCRIPT" start
+    ;;
+  stop)
+    "$SCRIPT" stop
+    echo -n "Stopping kstart for Apache2: k5start"
+    kstart_stop
+    echo "."
+    ;;
+  restart|force-reload)
+    "$0" stop
+    sleep 1
+    "$0" start
+    ;;
+  *)
+    exec "$SCRIPT" "$@"
+    ;;
+esac