This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 0d573e226f956e32035a41674e6f79e169305172 (commit) from 6ecbdec1b76812fc2657c11a66aecb7dc34ee658 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 0d573e226f956e32035a41674e6f79e169305172 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 31 10:09:46 2015 +0200

dnsmasq: fix initskript

-add timestamp filename -pull user config after define default parameter

-----------------------------------------------------------------------

Summary of changes: src/initscripts/init.d/dnsmasq | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)

Difference in files: diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 4e37925..ce7689f 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -15,18 +15,19 @@ . /etc/sysconfig/rc . ${rc_functions}

-# Pull custom configuration file -if [ -e "/etc/sysconfig/dnsmasq" ]; then - . /etc/sysconfig/dnsmasq -fi - CACHE_SIZE=2500 ENABLE_DNSSEC=1 SHOW_SRV=1 TRUST_ANCHOR=".,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5" +TIMESTAMP_FILE="/var/ipfire/dns/dnssec-timestamp" + +# Pull custom configuration file +if [ -e "/etc/sysconfig/dnsmasq" ]; then + . /etc/sysconfig/dnsmasq +fi

function dnssec_args() { - local cmdline="--dnssec --dnssec-timestamp" + local cmdline="--dnssec --dnssec-timestamp ${TIMESTAMP_FILE}"

if [ -n "${TRUST_ANCHOR}" ]; then cmdline="${cmdline} --trust-anchor=${TRUST_ANCHOR}"

hooks/post-receive -- IPFire 2.x development tree