From e24d6112bb364697d925ca436dddd5436448b477 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 2 Oct 2016 16:35:50 +0200
Subject: [PATCH] index.cgi: display unbound dns servers

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/rootfiles/core/106/filelists/files |  1 +
 html/cgi-bin/index.cgi                    | 20 +++++++-------------
 src/initscripts/init.d/unbound            |  2 ++
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 3d8cf8d7fa..3468c58eec 100644
--- 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 eafbdb1376..c142a65f7f 100644
--- 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 4d2b266758..dd5c85c7b5 100644
--- 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
 }
 
-- 
2.39.5