[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, debian, updated. upstream/2.2.1+dfsg-145-g7d9d425

[Russ Allbery]

The following commit has been merged in the debian branch:
commit 7d9d425475c0a8b6937aa2516024d9ae1ee4b29d
Author: Russ Allbery <rra at debian.org>
Date:   Wed Nov 11 14:38:07 2009 -0800

    Fix documentation in /etc/default/shibd
    
    We load this file after setting DAEMON_OPTS in the init script, so it
    overrides completely.  Update the documentation accordingly, and mention
    that if the PID file location is changed, PIDFILE should also be set to
    point to the new location.  Thanks, Ferenc Wagner.

diff --git a/debian/libapache2-mod-shib2.shibd.default b/debian/libapache2-mod-shib2.shibd.default
index 6d4f1ff..de352b9 100644
--- a/debian/libapache2-mod-shib2.shibd.default
+++ b/debian/libapache2-mod-shib2.shibd.default
@@ -7,10 +7,10 @@
 # To not start shibd at boot, uncomment this line.
 #NO_START=1
 
-# Options passed to shibd by the init script.  To whatever value is put here,
-# the init script will automatically add the options:
+# Options passed to shibd by the init script.  The default options are:
 #
-#     -f -c /etc/shibboleth2.xml -p /var/run/shibboleth/shibboleth.pid -w 30
+#     -f -c /etc/shibboleth2.xml -p $PIDFILE -w 30
 #
-# If you need to change those options, edit /etc/init.d/shibd.
+# If you change the -p option, also change the $PIDFILE variable to point to
+# the new location or the init script won't work.
 #DAEMON_OPTS=""

-- 
Debian packaging for the 2.0 Apache Shibboleth SP