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

separate keytab for apache

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

diff --git a/debian/changelog b/debian/changelog
index f5fdb55..e510062 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-www (3.15) unstable; urgency=low
+
+  * Use /etc/invirt/keytab instead of a separate keytab for apache
+
+ -- Evan Broder <broder@mit.edu>  Sun, 19 Oct 2008 19:56:04 -0400
+

 sipb-xen-www (3.14.4) unstable; urgency=low
 
   * allow '*' wildcard in config.errormail_exclude
 sipb-xen-www (3.14.4) unstable; urgency=low
 
   * allow '*' wildcard in config.errormail_exclude

diff --git a/files/etc/init.d/apache2.invirt b/files/etc/init.d/apache2.invirt
index 254508d..dd72f01 100755 (executable)
--- a/files/etc/init.d/apache2.invirt
+++ b/files/etc/init.d/apache2.invirt
@@ -13,7 +13,7 @@
 
 SCRIPT=/etc/init.d/apache2.invirt-orig
 KSTART_PIDFILE=/var/run/k5start-apache2.pid
 
 SCRIPT=/etc/init.d/apache2.invirt-orig
 KSTART_PIDFILE=/var/run/k5start-apache2.pid

-KSTART_KEYTAB=/etc/apache2/keytab
+KSTART_KEYTAB=/etc/invirt/keytab

 
 export AFSCELL=sipb.mit.edu
 
 
 export AFSCELL=sipb.mit.edu