[git.ipfire.org] IPFire 2.x development tree branch, master, updated. e2338aa7ef6936044b6782fdbdd6abc12738395c
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, master has been updated via e2338aa7ef6936044b6782fdbdd6abc12738395c (commit) via 8729316513b7cad457906f399b1cd173a1045c55 (commit) via 38f51465c98b29cbcd787b2cc9c060d617c66f6d (commit) via 351ad526b23daa2e36a7e09c5c2c7e59d4a35259 (commit) from 15e34194346674213e2cff30828f6f764311a685 (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 e2338aa7ef6936044b6782fdbdd6abc12738395c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 29 11:59:21 2020 +0100
make.sh: Modify update-contributors so that it will run with older version of awk
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8729316513b7cad457906f399b1cd173a1045c55 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 29 11:52:02 2020 +0100
convert-dns-settings: Explicitely enable using ISP name servers
The unbound initscript checks if this parameter is on.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 38f51465c98b29cbcd787b2cc9c060d617c66f6d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 29 11:47:35 2020 +0100
dns.cgi: Shorten time when checking if DNS is alive
For localhost, one second should be plenty
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 351ad526b23daa2e36a7e09c5c2c7e59d4a35259 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 29 11:40:59 2020 +0100
dns.cgi: Show recursor mode message even when we have some servers to show
The message was not shown when we have received DNS servers from the provider.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 7 +++++++ html/cgi-bin/credits.cgi | 2 +- html/cgi-bin/dns.cgi | 31 +++++++++++++++++-------------- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 2 +- make.sh | 11 ++++++++--- src/scripts/convert-dns-settings | 6 +++--- 15 files changed, 46 insertions(+), 22 deletions(-)
Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 4986317f8..10c2f87ce 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -621,6 +621,7 @@ WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisati WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. WARNING: untranslated string: dns proxy server = DNS Proxy Server +WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns title = Domain Name System WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers diff --git a/doc/language_issues.es b/doc/language_issues.es index 4ea707702..b97d017c3 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -832,6 +832,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. +WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.fr b/doc/language_issues.fr index f5f67243a..8e9d7babb 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -821,6 +821,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. +WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.it b/doc/language_issues.it index b83cdde9a..a4ea5e618 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -855,6 +855,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. +WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 003c9b6fe..ca1dee9b5 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -855,6 +855,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. +WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 4ea707702..b97d017c3 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -832,6 +832,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. +WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.ru b/doc/language_issues.ru index b783639a0..b76c83e56 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -836,6 +836,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. +WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 08702c67d..ef28f6ac8 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -832,6 +832,7 @@ WARNING: untranslated string: dns isp nameservers and tls not allowed = ISP-assi WARNING: untranslated string: dns mode for qname minimisation = QNAME Minimisation WARNING: untranslated string: dns no address given = No IP Address given. WARNING: untranslated string: dns no tls hostname given = No TLS hostname given. +WARNING: untranslated string: dns recursor mode = Recursor Mode WARNING: untranslated string: dns tls hostname = TLS Hostname WARNING: untranslated string: dns use isp assigned nameservers = Use ISP-assigned DNS servers WARNING: untranslated string: dns use protocol for dns queries = Protocol for DNS queries diff --git a/doc/language_missings b/doc/language_missings index 379eb9f61..40724a80b 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -263,6 +263,7 @@ < dns mode for qname minimisation < dns no address given < dns no tls hostname given +< dns recursor mode < dnssec aware < dnssec disabled warning < dnssec information @@ -935,6 +936,7 @@ < dns mode for qname minimisation < dns no address given < dns no tls hostname given +< dns recursor mode < dns tls hostname < dns use isp assigned nameservers < dns use protocol for dns queries @@ -1046,6 +1048,7 @@ < dns mode for qname minimisation < dns no address given < dns no tls hostname given +< dns recursor mode < dnssec disabled warning < dns tls hostname < dns use isp assigned nameservers @@ -1389,6 +1392,7 @@ < dns mode for qname minimisation < dns no address given < dns no tls hostname given +< dns recursor mode < dnssec aware < dnssec disabled warning < dnssec information @@ -1851,6 +1855,7 @@ < dns mode for qname minimisation < dns no address given < dns no tls hostname given +< dns recursor mode < dnssec aware < dnssec disabled warning < dnssec information @@ -2684,6 +2689,7 @@ < dns mode for qname minimisation < dns no address given < dns no tls hostname given +< dns recursor mode < dnssec aware < dnssec disabled warning < dnssec information @@ -3366,6 +3372,7 @@ < dns mode for qname minimisation < dns no address given < dns no tls hostname given +< dns recursor mode < dns tls hostname < dns use isp assigned nameservers < dns use protocol for dns queries diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 6eb7f1e49..f4f22e1a2 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -85,8 +85,8 @@ Ersan Yildirim, Stephan Feddersen, Joern-Ingo Weigert, Alexander Koch, -Wolfgang Apolinarski, Stéphane Pautrel, +Wolfgang Apolinarski, Alfred Haas, Lars Schuhmacher, Rene Zingel, diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index d4278d8b9..3b47f5ed4 100755 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -418,15 +418,23 @@ END sub show_nameservers () { &Header::openbox('100%', 'center', "$Lang::tr{'dns title'}");
+ # Determine if we are running in recursor mode + my $recursor = 0; + my $unbound_forward = qx(unbound-control forward); + if ($unbound_forward =~ m/^off/) { + $recursor = 1; + } + my $dns_status_string; my $dns_status_col; my $dns_working;
+ # Test if the DNS system is working. # # Simple send a request to unbound and check if it can resolve the # DNS test server. - my $dns_status_ret = &check_nameserver("127.0.0.1", "$dns_test_server", "UDP"); + my $dns_status_ret = &check_nameserver("127.0.0.1", "$dns_test_server", "UDP", undef, "+timeout=1", "+retry=0");
if ($dns_status_ret eq "2") { $dns_status_string = "$Lang::tr{'working'}"; @@ -437,6 +445,10 @@ sub show_nameservers () { $dns_status_col = "${Header::colourred}"; }
+ if ($recursor) { + $dns_status_string .= " (" . $Lang::tr{'dns recursor mode'} . ")"; + } + print <<END; <table width='100%'> <tr> @@ -705,25 +717,16 @@ print <<END; </table> END ; - } else { -print <<END; + print <<END; <table width="100%"> - <tr> - <td colspan="6" align="center"> - <br>$Lang::tr{'dns recursor mode'}<br> - </td> - </tr> - <tr> <form method="post" action="$ENV{'SCRIPT_NAME'}"> <td colspan="6" align="right"><input type="submit" name="SERVERS" value="$Lang::tr{'add'}"></td> </form> </tr> </table> - END -; }
&Header::closebox(); @@ -838,8 +841,8 @@ sub red_is_active () { }
# Function to check a given nameserver against propper work. -sub check_nameserver($$$$) { - my ($nameserver, $record, $proto, $tls_hostname) = @_; +sub check_nameserver($$$$$) { + my ($nameserver, $record, $proto, $tls_hostname, @args) = @_;
# Check if the system is online. unless (&red_is_active()) { @@ -848,7 +851,7 @@ sub check_nameserver($$$$) {
# Default values. my @command = ("kdig", "+dnssec", - "+bufsize=1232"); + "+bufsize=1232", @args);
# Handle different protols. if ($proto eq "TCP") { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 2cd2e24a2..80579e7cc 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -825,6 +825,7 @@ 'dns new 0' => 'Neue <strong>primäre</strong> DNS Server IP:', 'dns new 1' => 'Neue <strong>sekundäre</strong> DNS Server IP:', 'dns proxy server' => 'DNS-Proxyserver', +'dns recursor mode' => 'Recursor-Modus', 'dns saved' => 'Erfolgreich gespeichert!', 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', 'dns server' => 'DNS Server', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index dfc7e013f..1f81108f1 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -862,7 +862,7 @@ 'dns no address given' => 'No IP Address given.', 'dns no tls hostname given' => 'No TLS hostname given.', 'dns proxy server' => 'DNS Proxy Server', -'dns recursor mode' => 'Running in Recursor mode.', +'dns recursor mode' => 'Recursor Mode', 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', 'dns server' => 'DNS Server', diff --git a/make.sh b/make.sh index 452284c16..02043cf69 100755 --- a/make.sh +++ b/make.sh @@ -897,9 +897,14 @@ update_contributors() { local contributors="$(contributors | paste -sd , - | sed -e "s/,/&\\n/g")"
# Edit contributors into credits.cgi - awk -i inplace \ - "/<!-- CONTRIBUTORS -->/{ p=1; print; printf "${contributors}\n"}/<!-- END -->/{ p=0 } !p" \ - "${BASEDIR}/html/cgi-bin/credits.cgi" + local tmp="$(mktemp)" + + awk "/<!-- CONTRIBUTORS -->/{ p=1; print; printf "${contributors}\n"}/<!-- END -->/{ p=0 } !p" \ + < "${BASEDIR}/html/cgi-bin/credits.cgi" > "${tmp}" + + # Copy back modified content + cat "${tmp}" > "${BASEDIR}/html/cgi-bin/credits.cgi" + unlink "${tmp}"
print_status DONE return 0 diff --git a/src/scripts/convert-dns-settings b/src/scripts/convert-dns-settings index 23d76ec88..11efc7cba 100755 --- a/src/scripts/convert-dns-settings +++ b/src/scripts/convert-dns-settings @@ -58,9 +58,9 @@ main() { # Empty the old settings file : > /var/ipfire/dns/settings
- # Disable using ISP name servers when we already have some configured - if [ ${i} -gt 3 ]; then - echo "USE_ISP_NAMESERVERS=off" \ + # Enable using ISP name servers when no servers are configured + if [ ${i} -eq 3 ]; then + echo "USE_ISP_NAMESERVERS=on" \ >> /var/ipfire/dns/settings fi fi
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer