index.cgi: display unbound dns servers

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 3d8cf8d7fa1fe9a4caf9cbbae6950b1fdd89a964..3468c58eecbe16ee744d13b00c0ef048b8b296dd 100644 (file)
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -15,6 +15,7 @@ srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/dnsforward.cgi
 srv/web/ipfire/cgi-bin/firewall.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/pppsetup.cgi
 srv/web/ipfire/cgi-bin/services.cgi

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

diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound
index 4d2b266758f29fd6055750a3d4978f6bed8afa9c..dd5c85c7b5f1bbeaeda827c67e3488c430d80b6b 100644 (file)
--- a/src/initscripts/init.d/unbound
+++ b/src/initscripts/init.d/unbound
@@ -90,12 +90,14 @@ update_forwarders() {
                        boot_mesg "Configuring upstream name server(s): ${forwarders:1}" ${INFO}
                        echo_ok
 
+                       echo "${forwarders}" > /var/ipfire/red/dns
                        unbound-control -q forward ${forwarders}
                        return 0
                fi
        fi
 
        # If forwarders cannot be used we run in recursor mode
+       echo "local recursor" > /var/ipfire/red/dns
        unbound-control -q forward off
 }