From d1a76d47f2564975c5c6c852acfccfd405cd80fd Mon Sep 17 00:00:00 2001
From: Warren Baker <warren@decoy.co.za>
Date: Sun, 12 Jun 2011 16:08:58 +0200
Subject: Move some settings to advanced page.

---
 config/unbound/unbound.xml | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

(limited to 'config/unbound')

diff --git a/config/unbound/unbound.xml b/config/unbound/unbound.xml
index b143231e..04b3f91c 100644
--- a/config/unbound/unbound.xml
+++ b/config/unbound/unbound.xml
@@ -7,7 +7,7 @@
 		/*
 		    unbound.xml
 		    part of the Unbound package for pfSense (http://www.pfSense.com)
-		    Copyright (C) 2011 Warren Baker warren@decoy.co.za
+		    Copyright (C) 2011 Warren Baker
 		    All rights reserved.
 		                                                       						  */
 		/* ========================================================================== */
@@ -41,7 +41,7 @@
 	<faq/>
 	<name>unbound</name>
 	<version>1.4.8</version>
-	<title>Services: Unbound DNS Forwarder</title>
+	<title>Services: Unbound DNS Forwarder: Basic Settings</title>
 	<include_file>/usr/local/pkg/unbound.inc</include_file>
 	<menu>
 		<name>Unbound DNS</name>
@@ -70,11 +70,22 @@
 		<chmod>0644</chmod>
 		<item>http://www.pfsense.org/packages/config/unbound/unbound_acls.xml</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.org/packages/config/unbound/unbound_advanced.xml</item>
+	</additional_files_needed>
+	
 	<tabs>
 		<tab>
 			<text>Unbound DNS Settings</text>
 			<url>/pkg_edit.php?xml=unbound.xml&amp;id=0</url>
 			<active/>
+			<no_drop_down/>
+		</tab>
+		<tab>
+			<text>Unbound DNS Advanced Settings</text>
+			<url>/pkg_edit.php?xml=unbound_advanced.xml&amp;id=0</url>
 		</tab>
 		<tab>
 			<text>Unbound DNS ACLs</text>
@@ -87,7 +98,7 @@
 	</tabs>
 	<fields>
 		<field>
-			<name>Unbound DNS Settings</name>
+			<name>Settings</name>
 			<type>listtopic</type>
 		</field>
 		<field>
@@ -141,23 +152,6 @@
 			<description>If this option is set, then DHCP static mappings will be registered in the DNS forwarder, so that their name can be resolved. You should also set the domain in &lt;a href="system.php"&gt;System: General setup&lt;/a&gt; to the proper value.</description>
 			<type>checkbox</type>
 		</field>
-		<field>
-			<fieldname>msg_cache_size</fieldname>
-			<fielddescr>Message Cache Size</fielddescr>
-			<description>Size of the message cache. The message cache stores DNS rcodes and validation statuses. The RRSet cache will automatically be set to twice this amount. The RRSet cache contains the RR data. The default is 4 megabytes.</description>
-			<type>select</type>
-			<default_value>4</default_value>
-			<options>
-				<option><name>4MB</name><value>4</value></option>
-				<option><name>10MB</name><value>10</value></option>
-				<option><name>20MB</name><value>20</value></option>
-				<option><name>50MB</name><value>50</value></option>
-				<option><name>100MB</name><value>100</value></option>
-				<option><name>250MB</name><value>250</value></option>
-				<option><name>250MB</name><value>250</value></option>
-				<option><name>512MB</name><value>512</value></option>
-			</options>
-		</field>
 		<field>
 			<fieldname>txtsupport</fieldname>
 			<fielddescr>TXT Comment Support</fielddescr>
@@ -172,7 +166,7 @@
 			<type>checkbox</type>
 		</field>
 		<field>
-			<name>Unbound Statistics</name>
+			<name>Statistics</name>
 			<type>listtopic</type>
 		</field>
 		<field>
@@ -219,7 +213,7 @@
 	</custom_add_php_command>
 	<custom_php_command_before_form/>
 	<custom_php_validation_command>
-		unbound_validate($_POST);
+		unbound_validate($_POST, "basic");
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		unbound_reconfigure();
-- 
cgit v1.2.3