Index: trunk/packages/sipb-xen-www/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-www/debian/changelog	(revision 853)
+++ trunk/packages/sipb-xen-www/debian/changelog	(revision 854)
@@ -5,5 +5,7 @@
   * allow ~ uris
 
- -- Greg Price <price@mit.edu>  Sun,  3 Aug 2008 04:11:23 -0400
+  * take instance from keytab in k5start apache2.init wrapper
+
+ -- Greg Price <price@mit.edu>  Mon,  4 Aug 2008 01:22:47 -0400
 
 sipb-xen-www (3.6) unstable; urgency=low
Index: trunk/packages/sipb-xen-www/files/etc/init.d/apache2.invirt
===================================================================
--- trunk/packages/sipb-xen-www/files/etc/init.d/apache2.invirt	(revision 853)
+++ trunk/packages/sipb-xen-www/files/etc/init.d/apache2.invirt	(revision 854)
@@ -7,5 +7,4 @@
 KSTART_PIDFILE=/var/run/k5start-apache2.pid
 KSTART_KEYTAB=/etc/apache2/keytab
-INSTANCE=xvm-2.mit.edu
 
 export AFSCELL=sipb.mit.edu
@@ -18,5 +17,5 @@
     /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 "$INSTANCE" -S afs -I sipb.mit.edu -t -b
+	-U -f "$KSTART_KEYTAB" -K10 -S afs -I "$AFSCELL" -t -b
     cat "$TMP_PIDFILE" >|"$KSTART_PIDFILE"
     rm -f "$TMP_PIDFILE"