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 08ded6035f61ed97e3a122dc1832703084b72f86 (commit) via 3b521c724f09a45e09ac9228d8b65df0d8bd13a7 (commit) from 57521504a89e792336f55e893564a000bfe4b1d7 (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 08ded6035f61ed97e3a122dc1832703084b72f86 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 18 15:35:29 2019 +0000

dnsforward.cgi: Check DISABLE_DNSSEC checkbox when editing

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 3b521c724f09a45e09ac9228d8b65df0d8bd13a7 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 18 15:24:56 2019 +0000

ipsec-interfaces: Apply static routes (again) after creating IPsec interfaces

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/rootfiles/core/130/filelists/files | 2 ++ html/cgi-bin/dnsforward.cgi | 4 ++-- src/scripts/ipsec-interfaces | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files index d33ede19c..10e0184a3 100644 --- a/config/rootfiles/core/130/filelists/files +++ b/config/rootfiles/core/130/filelists/files @@ -9,9 +9,11 @@ etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/suricata etc/syslog.conf srv/web/ipfire/cgi-bin/aliases.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/ids.dat srv/web/ipfire/cgi-bin/logs.cgi/log.dat +usr/local/bin/ipsec-interfaces usr/local/bin/suricatactrl usr/local/bin/update-ids-ruleset usr/sbin/convert-snort diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index d9807c90e..391905f71 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -189,7 +189,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) $cgiparams{'ZONE'} = $temp[1]; $cgiparams{'FORWARD_SERVERS'} = join(",", split(/|/, $temp[2])); $cgiparams{'REMARK'} = $temp[3]; - $cgiparams{'DISABLE_DNSSEC'} = $temp[4]; + $cgiparams{'DISABLE_DNSSEC'} = ($temp[4] eq "on") ? "on" : "off"; } } } @@ -250,7 +250,7 @@ print <<END </tr> <tr> <td width ='20%' class='base'>$Lang::tr{'dns forward disable dnssec'}:</td> - <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}' /></td> + <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}{'on'} /></td> </tr> </table> <br> diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces index 0e43fccbc..cb55fdf79 100644 --- a/src/scripts/ipsec-interfaces +++ b/src/scripts/ipsec-interfaces @@ -167,6 +167,9 @@ main() { log "Deleting interface ${intf}" ip link del "${intf}" &>/dev/null done + + # (Re-)Apply all static routes + /etc/init.d/static-routes start }

main || exit $?

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