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

[Ferenc Wagner]

"Russ Allbery" <rra at debian.org> writes:

> commit 8411e75b23bc50d9c98019b18902f5df4de516b3
> [...]
> diff --git a/debian/libapache2-mod-shib2.shibd.default b/debian/libapache2-mod-shib2.shibd.default
> index 133f110..6d4f1ff 100644
> --- 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=""

Hi Russ,

This isn't true, unless you plan to change the init script as well.
This default file is sourced after the init script put the above into
the DAEMON_OPTS variable.  Alternatively, we could replace the line

#DAEMON_OPTS=""

with 

DAEMON_OPTS="$DAEMON_OPTS"

trying to convey this info in the code itself.
-- 
Thanks,
Feri.