Improve documentation of DAEMON_OPTS in /etc/default/shibd

diff --git a/debian/changelog b/debian/changelog
index 222ee21..a803bd6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ shibboleth-sp2 (2.3+dfsg-1) UNRELEASED; urgency=high
   * Tighten build and package dependencies on xmltooling and opensaml2 to
     require the versions with the security fix.
   * Fix watch file for the new version mangling.
+  * Improve documentation of DAEMON_OPTS in /etc/default/shibd.
   * Remove unnecessary patches to upstream files regenerated during the
     build from the source package diff.
 

diff --git a/debian/libapache2-mod-shib2.shibd.default b/debian/libapache2-mod-shib2.shibd.default
index 133f110..6d4f1ff 100644 (file)
--- a/debian/libapache2-mod-shib2.shibd.default
+++ b/debian/libapache2-mod-shib2.shibd.default
@@ -7,5 +7,10 @@
 # To not start shibd at boot, uncomment this line.
 #NO_START=1
 
-# Replace options passed to shibd by the init script.
+# Options passed to shibd by the init script.  To whatever value is put here,
+# the init script will automatically add the options:
+#
+#     -f -c /etc/shibboleth2.xml -p /var/run/shibboleth/shibboleth.pid -w 30
+#
+# If you need to change those options, edit /etc/init.d/shibd.
 #DAEMON_OPTS=""