From 38ef054c2f0a27cd0832a8eba4babd1ccf750a46 Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Mon, 4 Aug 2008 01:24:03 -0400
Subject: [PATCH] take instance from keytab in k5start apache2.init wrapper
svn path=/trunk/packages/sipb-xen-www/; revision=854
---
debian/changelog | 4 +++-
files/etc/init.d/apache2.invirt | 3 +--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a68e7b7..ea6d481 100644
--- 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
--- 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"
}
--
1.7.9.5