index.cgi: display unbound dns servers

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2016-10-02 16:35:50 +02:00
parent cc60329d88
commit e24d6112bb
3 changed files with 10 additions and 13 deletions

View File

@@ -15,6 +15,7 @@ srv/web/ipfire/cgi-bin/dns.cgi
srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi
srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/hosts.cgi srv/web/ipfire/cgi-bin/hosts.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/services.cgi

View File

@@ -200,26 +200,20 @@ END
END END
} }
my @dns_servers = (); my $dns_servers;
foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") { if ( -e "${General::swroot}/red/dns" ) {
open(DNS, "<$f"); open (TMP, "<${General::swroot}/red/dns");
my $dns_server = <DNS>; $dns_servers = <TMP>;
close(DNS); chomp($dns_servers);
close TMP;
chomp($dns_server);
if ($dns_server) {
push(@dns_servers, $dns_server);
}
} }
my $dns_servers_str = join(", ", @dns_servers);
print <<END; print <<END;
<tr> <tr>
<td> <td>
<b>$Lang::tr{'dns servers'}:</b> <b>$Lang::tr{'dns servers'}:</b>
</td> </td>
<td style='text-align:center;'> <td style='text-align:center;'>
$dns_servers_str $dns_servers
</td> </td>
<td></td> <td></td>
</tr> </tr>

View File

@@ -90,12 +90,14 @@ update_forwarders() {
boot_mesg "Configuring upstream name server(s): ${forwarders:1}" ${INFO} boot_mesg "Configuring upstream name server(s): ${forwarders:1}" ${INFO}
echo_ok echo_ok
echo "${forwarders}" > /var/ipfire/red/dns
unbound-control -q forward ${forwarders} unbound-control -q forward ${forwarders}
return 0 return 0
fi fi
fi fi
# If forwarders cannot be used we run in recursor mode # If forwarders cannot be used we run in recursor mode
echo "local recursor" > /var/ipfire/red/dns
unbound-control -q forward off unbound-control -q forward off
} }