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 6f1f51ba1c9e211946bb7b829bd7362ff61ecae7 (commit) via f33d28978d0014e956fb98c6dc42d79fb1a7d3d6 (commit) via cb8a25e5ec4c045f634ba585012f2edf09e6be29 (commit) via 1a26564e95b5694337e51860544e7775d35055f3 (commit) via c9ae511ecf3caea0836b06211ca49d3fec4bf6b8 (commit) from 086bb132ec3155b9221cee5acf307fabfb7515b6 (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 6f1f51ba1c9e211946bb7b829bd7362ff61ecae7 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 19 21:01:20 2018 +0100
core127: Ship DNS forwarding settings
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f33d28978d0014e956fb98c6dc42d79fb1a7d3d6 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 19 21:00:21 2018 +0100
unbound: Use correct parameter for IP addresses and hostnames
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cb8a25e5ec4c045f634ba585012f2edf09e6be29 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 19 20:47:41 2018 +0100
DNS Forwarding: Let UI accept hostnames, too
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1a26564e95b5694337e51860544e7775d35055f3 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 19 20:42:46 2018 +0100
DNS Forwarding: Allow passing multiple name servers (separated by comma)
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c9ae511ecf3caea0836b06211ca49d3fec4bf6b8 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 19 20:23:59 2018 +0100
unbound: Allow forwarding to multiple servers at the same time
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/127/filelists/files | 2 ++ doc/language_issues.de | 1 + doc/language_issues.en | 4 +++- doc/language_issues.es | 4 +++- doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 4 +++- doc/language_issues.ru | 4 +++- doc/language_issues.tr | 2 ++ doc/language_missings | 17 +++++++++++++--- html/cgi-bin/dnsforward.cgi | 32 ++++++++++++++++++++----------- langs/de/cgi-bin/de.pl | 3 ++- langs/en/cgi-bin/en.pl | 3 ++- src/initscripts/system/unbound | 20 +++++++++++++++---- 15 files changed, 78 insertions(+), 24 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files index 1bcc4ca54..0e9d80520 100644 --- a/config/rootfiles/core/127/filelists/files +++ b/config/rootfiles/core/127/filelists/files @@ -3,3 +3,5 @@ etc/issue srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs etc/rc.d/init.d/aws +etc/rc.d/init.d/unbound +srv/web/ipfire/cgi-bin/dnsforward.cgi diff --git a/doc/language_issues.de b/doc/language_issues.de index e2048d7d1..6b770e5e3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -706,6 +706,7 @@ WARNING: untranslated string: bytes = unknown string WARNING: untranslated string: captive = unknown string WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules WARNING: untranslated string: dead peer detection = Dead Peer Detection +WARNING: untranslated string: dnsforward forward_server = unknown string WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 228b685f8..72a56b96d 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -650,7 +650,8 @@ WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries -WARNING: untranslated string: dnsforward forward_server = Nameserver +WARNING: untranslated string: dnsforward forward_server = unknown string +WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnsforward zone = Zone WARNING: untranslated string: dnssec aware = DNSSEC Aware WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled @@ -1120,6 +1121,7 @@ WARNING: untranslated string: invalid input for remote host/ip = Invalid input f WARNING: untranslated string: invalid input for state or province = Invalid input for state or province. WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). WARNING: untranslated string: invalid ip = Invalid IP Address +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid keep time = Keep time must be a valid number WARNING: untranslated string: invalid key = Invalid key. WARNING: untranslated string: invalid local-remote id = local & remote id must not be equal and begin with a "@" sign. These are leftid and rightid in strongswan terminology. diff --git a/doc/language_issues.es b/doc/language_issues.es index 01315971b..caf8fc497 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -755,7 +755,8 @@ WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries -WARNING: untranslated string: dnsforward forward_server = Nameserver +WARNING: untranslated string: dnsforward forward_server = unknown string +WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnsforward zone = Zone WARNING: untranslated string: dnssec aware = DNSSEC Aware WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled @@ -1028,6 +1029,7 @@ WARNING: untranslated string: invalid input for dpd delay = Invalid input for DP WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec network = IPsec network diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 3fd7f35c4..7b9119764 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -742,6 +742,7 @@ WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Scan for Songs = unknown string WARNING: untranslated string: bytes = unknown string WARNING: untranslated string: captive = unknown string +WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string @@ -781,6 +782,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: guardian watch snort alertfile = unknown string WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: no data = unknown string WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> WARNING: untranslated string: pakfire ago = ago. diff --git a/doc/language_issues.it b/doc/language_issues.it index 1a1b283c0..301c0c28d 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -766,6 +766,7 @@ WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm: WARNING: untranslated string: dhcp dns update secret = Secret: WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) +WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled WARNING: untranslated string: eight hours = 8 Hours WARNING: untranslated string: email config = Configuration @@ -856,6 +857,7 @@ WARNING: untranslated string: incoming overhead in bytes per second = Incoming O WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: masquerade blue = Masquerade BLUE diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 0de2a0f17..bbd78eeeb 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -772,6 +772,7 @@ WARNING: untranslated string: dhcp dns update algo = Algorithm: WARNING: untranslated string: dhcp dns update secret = Secret: WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dns servers = DNS Servers +WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnssec aware = DNSSEC Aware WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled WARNING: untranslated string: dnssec information = DNSSEC Information @@ -872,6 +873,7 @@ WARNING: untranslated string: incoming overhead in bytes per second = Incoming O WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: masquerade blue = Masquerade BLUE diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 01315971b..caf8fc497 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -755,7 +755,8 @@ WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries -WARNING: untranslated string: dnsforward forward_server = Nameserver +WARNING: untranslated string: dnsforward forward_server = unknown string +WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnsforward zone = Zone WARNING: untranslated string: dnssec aware = DNSSEC Aware WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled @@ -1028,6 +1029,7 @@ WARNING: untranslated string: invalid input for dpd delay = Invalid input for DP WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec network = IPsec network diff --git a/doc/language_issues.ru b/doc/language_issues.ru index ca75c0b29..d5a2fc336 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -759,7 +759,8 @@ WARNING: untranslated string: dnsforward add a new entry = Add a new entry WARNING: untranslated string: dnsforward configuration = DNS forward configuration WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry WARNING: untranslated string: dnsforward entries = Current entries -WARNING: untranslated string: dnsforward forward_server = Nameserver +WARNING: untranslated string: dnsforward forward_server = unknown string +WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: dnsforward zone = Zone WARNING: untranslated string: dnssec aware = DNSSEC Aware WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled @@ -1030,6 +1031,7 @@ WARNING: untranslated string: invalid input for dpd delay = Invalid input for DP WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days). +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec network = IPsec network diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 6a79d65a4..b32d216b5 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -743,6 +743,7 @@ WARNING: untranslated string: bytes = unknown string WARNING: untranslated string: captive = unknown string WARNING: untranslated string: crypto error = Cryptographic error WARNING: untranslated string: crypto warning = Cryptographic warning +WARNING: untranslated string: dnsforward forward_servers = Nameservers WARNING: untranslated string: fwdfw all subnets = All subnets WARNING: untranslated string: fwhost cust geoipgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string @@ -783,6 +784,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: guardian watch snort alertfile = unknown string WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string WARNING: untranslated string: info messages = unknown string +WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: no data = unknown string WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit! <br>Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".</br> WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br> diff --git a/doc/language_missings b/doc/language_missings index 56219c5fc..188455681 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -210,7 +210,7 @@ < dnsforward configuration < dnsforward edit an entry < dnsforward entries -< dnsforward forward_server +< dnsforward forward_servers < dnsforward zone < dnssec aware < dnssec disabled warning @@ -494,6 +494,7 @@ < invalid input for dpd timeout < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < ipsec < ipsec network @@ -781,6 +782,8 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< dnsforward forward_servers +< invalid ip or hostname < ovpn warning rfc3280 < wlanap neighbor scan < wlanap neighbor scan warning @@ -860,6 +863,7 @@ < dhcp dns update algo < dhcp dns update secret < dl client arch insecure +< dnsforward forward_servers < dnssec disabled warning < eight hours < email config @@ -919,6 +923,7 @@ < incoming overhead in bytes per second < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < log server protocol < masquerade blue @@ -1082,6 +1087,7 @@ < dh name is invalid < dh parameter < dl client arch insecure +< dnsforward forward_servers < dnssec aware < dnssec disabled warning < dnssec information @@ -1153,6 +1159,7 @@ < incoming overhead in bytes per second < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < log server protocol < masquerade blue @@ -1423,7 +1430,7 @@ < dnsforward configuration < dnsforward edit an entry < dnsforward entries -< dnsforward forward_server +< dnsforward forward_servers < dnsforward zone < dnssec aware < dnssec disabled warning @@ -1709,6 +1716,7 @@ < invalid input for dpd timeout < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < ipsec < ipsec network @@ -2137,7 +2145,7 @@ < dnsforward configuration < dnsforward edit an entry < dnsforward entries -< dnsforward forward_server +< dnsforward forward_servers < dnsforward zone < dnssec aware < dnssec disabled warning @@ -2427,6 +2435,7 @@ < invalid input for dpd timeout < invalid input for inactivity timeout < invalid input for valid till days +< invalid ip or hostname < invalid logserver protocol < ipsec < ipsec network @@ -2700,7 +2709,9 @@ ############################################################################ < crypto error < crypto warning +< dnsforward forward_servers < fwdfw all subnets +< invalid ip or hostname < ovpn error dh < ovpn error md5 < ovpn warning rfc3280 diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index ee63c6dd7..521a7a20b 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -50,7 +50,7 @@ my %mainsettings = (); $cgiparams{'ENABLED'} = 'off'; $cgiparams{'ACTION'} = ''; $cgiparams{'ZONE'} = ''; -$cgiparams{'FORWARD_SERVER'} = ''; +$cgiparams{'FORWARD_SERVERS'} = ''; $cgiparams{'REMARK'} =''; &Header::getcgihash(%cgiparams); open(FILE, $filename) or die 'Unable to open config file.'; @@ -67,14 +67,21 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'}) $errormessage = $Lang::tr{'invalid domain name'}; }
- # Check if the settings for the forward server are valid. - unless(&General::validip($cgiparams{'FORWARD_SERVER'})) { - $errormessage = $Lang::tr{'invalid ip'}; + my @forward_servers = split(/,/, $cgiparams{'FORWARD_SERVERS'}); + foreach my $forward_server (@forward_servers) { + # Check if the settings for the forward server are valid. + unless(&General::validip($forward_server) || &General::validfqdn($forward_server)) { + $errormessage = "$Lang::tr{'invalid ip or hostname'}: $forward_server"; + last; + } }
# Go further if there was no error. if ( ! $errormessage) { + # Save servers separated by | + $cgiparams{'FORWARD_SERVERS'} = join("|", @forward_servers); + # Check if a remark has been entered. $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
@@ -82,7 +89,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'}) if($cgiparams{'EDITING'} eq 'no') { open(FILE,">>$filename") or die 'Unable to open config file.'; flock FILE, 2; - print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n"; + print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVERS'},$cgiparams{'REMARK'}\n"; } else { open(FILE, ">$filename") or die 'Unable to open config file.'; flock FILE, 2; @@ -91,7 +98,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'}) { $id++; if ($cgiparams{'EDITING'} eq $id) { - print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n"; + print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVERS'},$cgiparams{'REMARK'}\n"; } else { print FILE "$line"; } } } @@ -167,7 +174,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) my @temp = split(/,/,$line); $cgiparams{'ENABLED'} = $temp[0]; $cgiparams{'ZONE'} = $temp[1]; - $cgiparams{'FORWARD_SERVER'} = $temp[2]; + $cgiparams{'FORWARD_SERVERS'} = join(",", split(/|/, $temp[2])); $cgiparams{'REMARK'} = $temp[3]; } } @@ -214,7 +221,7 @@ print <<END
<tr> <td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}: <img src='/blob.gif' alt='*' /></td> - <td><input type='text' name='FORWARD_SERVER' value='$cgiparams{'FORWARD_SERVER'}' size='24' /></td> + <td><input type='text' name='FORWARD_SERVERS' value='$cgiparams{'FORWARD_SERVERS'}' size='24' /></td> </tr> </table>
@@ -255,7 +262,7 @@ print <<END <table width='100%' class='tbl'> <tr> <th width='35%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward zone'}</b></th> - <th width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_server'}</b></th> + <th width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_servers'}</b></th> <th width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th> <th width='5%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></th> </tr> @@ -284,7 +291,10 @@ foreach my $line (@current) my $gif = ''; my $gdesc = ''; my $toggle = ''; - + + # Format lists of servers + my $servers = join(", ", split(/|/, $temp[2])); + if($cgiparams{'ACTION'} eq $Lang::tr{'edit'} && $cgiparams{'ID'} eq $id) { print "<tr>"; $col="bgcolor='${Header::colouryellow}'"; } @@ -303,7 +313,7 @@ foreach my $line (@current) # print <<END <td align='center' $col>$temp[1]</td> - <td align='center' $col>$temp[2]</td> + <td align='center' $col>$servers</td> <td align='center' $col>$temp[3]</td> <td align='center' $col> <form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 42eb14103..0ca760f52 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -821,7 +821,7 @@ 'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung', 'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten', 'dnsforward entries' => 'Aktuelle Einträge', -'dnsforward forward_server' => 'DNS-Server', +'dnsforward forward_servers' => 'DNS-Server', 'dnsforward zone' => 'Zone', 'dnssec aware' => 'DNSSEC-Informationen verfügbar, aber nicht validierend', 'dnssec disabled warning' => 'WARNUNG: DNSSEC wurde deaktiviert', @@ -1405,6 +1405,7 @@ 'invalid input for state or province' => 'Ungültige Eingabe für Bundesstaat oder Provinz.', 'invalid input for valid till days' => 'Ungültige Eingabe für Gültig bis (Tage).', 'invalid ip' => 'Ungültige IP-Adresse', +'invalid ip or hostname' => 'Ungültige IP-Addresse oder Hostname', 'invalid keep time' => 'Die Aufbewahrungszeit muss eine gültige Zahl sein', 'invalid key' => 'Ungültiger Schlüssel.', 'invalid loaded file' => 'Ungültige geladene Datei', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index e9356407a..465738b96 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -846,7 +846,7 @@ 'dnsforward configuration' => 'DNS forward configuration', 'dnsforward edit an entry' => 'Edit an existing entry', 'dnsforward entries' => 'Current entries', -'dnsforward forward_server' => 'Nameserver', +'dnsforward forward_servers' => 'Nameservers', 'dnsforward zone' => 'Zone', 'dnssec aware' => 'DNSSEC Aware', 'dnssec disabled warning' => 'WARNING: DNSSEC has been disabled', @@ -1436,6 +1436,7 @@ 'invalid input for state or province' => 'Invalid input for state or province.', 'invalid input for valid till days' => 'Invalid input for Valid till (days).', 'invalid ip' => 'Invalid IP Address', +'invalid ip or hostname' => 'Invalid IP Address or Hostname', 'invalid keep time' => 'Keep time must be a valid number', 'invalid key' => 'Invalid key.', 'invalid loaded file' => 'Invalid loaded file', diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index cc46c33c9..08007f50a 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -197,8 +197,8 @@ write_forward_conf() {
local insecure_zones="${INSECURE_ZONES}"
- local enabled zone server remark - while IFS="," read -r enabled zone server remark; do + local enabled zone server servers remark + while IFS="," read -r enabled zone servers remark; do # Line must be enabled. [ "${enabled}" = "on" ] || continue
@@ -215,7 +215,13 @@ write_forward_conf() { *.in-addr.arpa) echo "stub-zone:" echo " name: ${zone}" - echo " stub-addr: ${server}" + for server in ${servers//|/ }; do + if [[ ${server} =~ ^[0-9]+.[0-9]+.[0-9]+.[0-9]+$ ]]; then + echo " stub-addr: ${server}" + else + echo " stub-host: ${server}" + fi + done echo echo "server:" echo " local-zone: "${zone}" transparent" @@ -224,7 +230,13 @@ write_forward_conf() { *) echo "forward-zone:" echo " name: ${zone}" - echo " forward-addr: ${server}" + for server in ${servers//|/ }; do + if [[ ${server} =~ ^[0-9]+.[0-9]+.[0-9]+.[0-9]+$ ]]; then + echo " forward-addr: ${server}" + else + echo " forward-host: ${server}" + fi + done echo ;; esac
hooks/post-receive -- IPFire 2.x development tree