Limit the number of secrets: use /etc/invirt/keytab instead of a

[invirt/packages/invirt-web.git] / files / etc / init.d / apache2.invirt

diff --git a/files/etc/init.d/apache2.invirt b/files/etc/init.d/apache2.invirt
index 34c6baa..dd72f01 100755 (executable)
--- a/files/etc/init.d/apache2.invirt
+++ b/files/etc/init.d/apache2.invirt
@@ -1,12 +1,19 @@
 #!/usr/bin/pagsh -e
+### BEGIN INIT INFO
+# Provides:          apache2
+# Required-Start:    $local_fs $remote_fs $network $syslog openafs-client
+# Required-Stop:     $local_fs $remote_fs $network $syslog openafs-client
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop apache2 web server
+### END INIT INFO
 #
 # Apache kstart wrapper by anders.
 #
 
 SCRIPT=/etc/init.d/apache2.invirt-orig
 KSTART_PIDFILE=/var/run/k5start-apache2.pid
-KSTART_KEYTAB=/etc/apache2/keytab
-INSTANCE=xvm-2.mit.edu
+KSTART_KEYTAB=/etc/invirt/keytab
 
 export AFSCELL=sipb.mit.edu
 
@@ -17,7 +24,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"
 }