take instance from keytab in k5start apache2.init wrapper

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

diff --git a/debian/changelog b/debian/changelog
index a68e7b7..ea6d481 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,9 @@ sipb-xen-www (3.7) unstable; urgency=low
   * rewrite static/ uris for admin mode
   * 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
 

diff --git a/files/etc/init.d/apache2.invirt b/files/etc/init.d/apache2.invirt
index 34c6baa..9b07a5c 100755 (executable)
--- a/files/etc/init.d/apache2.invirt
+++ b/files/etc/init.d/apache2.invirt
@@ -6,7 +6,6 @@
 SCRIPT=/etc/init.d/apache2.invirt-orig
 KSTART_PIDFILE=/var/run/k5start-apache2.pid
 KSTART_KEYTAB=/etc/apache2/keytab
-INSTANCE=xvm-2.mit.edu
 
 export AFSCELL=sipb.mit.edu
 
@@ -17,7 +16,7 @@ kstart_start () {
     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 "$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"
 }