From a56bae9900a3d6bf36965eb0abfc736b5ef77abf Mon Sep 17 00:00:00 2001
From: "Craig M. Coffee" <craigc@netlab7.com>
Date: Thu, 29 Apr 2010 04:12:01 +0000
Subject: [PATCH] applications/luci-multiwan: Removed resolv.conf config option
 and added dns server settings

---
 .../luasrc/model/cbi/multiwan/multiwan.lua         | 12 +++++------
 .../root/lib/uci/schema/default/multiwan           | 23 +++++++++++-----------
 po/templates/multiwan.pot                          |  8 ++++----
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
index 64c72387f..8786ebc83 100644
--- a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
+++ b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
@@ -26,12 +26,6 @@ default_route.default = "balancer"
 default_route.optional = false
 default_route.rmempty = false
 
-resolv_conf = s:option(Value, "resolv_conf", translate("DNS Configuration File"),
-	translate("Writeable resolv file, dnsmasq defaults to /tmp/resolv.conf.auto"))
-resolv_conf.default = "/tmp/resolv.conf.auto"
-resolv_conf.optional = false
-resolv_conf.rmempty = false
-
 s = m:section(TypedSection, "interface", translate("WAN Interfaces"),
 	translate("Health Monitor detects and corrects network changes and failed connections."))
 s.addremove = true
@@ -113,6 +107,12 @@ failover_to.default = "balancer"
 failover_to.optional = false
 failover_to.rmempty = false
 
+dns = s:option(Value, "dns", translate("DNS Server(s)"))
+dns:value("", translate("Auto"))
+dns.default = ""
+dns.optional = false
+dns.rmempty = true
+
 s = m:section(TypedSection, "mwanfw", translate("Multi-WAN Traffic Rules"),
 	translate("Configure rules for directing outbound traffic through specified WAN Uplinks."))
 s.template = "cbi/tblsection"
diff --git a/applications/luci-multiwan/root/lib/uci/schema/default/multiwan b/applications/luci-multiwan/root/lib/uci/schema/default/multiwan
index 61f34e703..d85d98d5e 100644
--- a/applications/luci-multiwan/root/lib/uci/schema/default/multiwan
+++ b/applications/luci-multiwan/root/lib/uci/schema/default/multiwan
@@ -15,41 +15,35 @@ config variable
 	option section	'multiwan.multiwan'
 	option required true
 
-config variable
-	option name	'resolv_conf'
-	option title	'DNS configuration file'
-	option section	'multiwan.multiwan'
-	option required true
-
 config section
 	option name     'interface'
-	option title    'WAN Uplinks Configuration'
+	option title    'WAN Interfaces'
 	option named    true
 	option required true
 
 config variable
 	option name	'weight'
-	option title    'Load Balancer Weight'
+	option title    'Load Balancer Distribution'
 	option section  'multiwan.interface'
 	option datatype 'integer'
 	option required true
 
 config variable
 	option name	'health_interval'
-	option title	'Health Monitor - Interval'
+	option title	'Health Monitor Interval'
 	option section	'multiwan.multiwan'
 	option datatype 'integer'
 	option required true
 
 config variable
 	option name	'icmp_hosts'
-	option title	'Health Monitor - ICMP Host(s)'
+	option title	'Health Monitor ICMP Host(s)'
 	option section	'multiwan.interface'
 	option required true
 
 config variable
 	option name	'timeout'
-	option title	'Health Monitor - ICMP Timeout'
+	option title	'Health Monitor ICMP Timeout'
 	option section	'multiwan.interface'
 	option datatype 'integer'
 	option required true
@@ -74,6 +68,11 @@ config variable
 	option section	'multiwan.interface'
 	option required true
 
+config variable
+	option name	'dns'
+	option title	'DNS Server(s)'
+	option section	'multiwan.interface'
+
 config section
 	option name     'mwanfw'
 	option title    'Multi-WAN Traffic Rules'
@@ -101,7 +100,7 @@ config section
 
 config section
 	option name     'wanrule'
-	option title    'WAN Traffic Decision'
+	option title    'WAN Uplink'
 	option section  'multiwan.mwanfw'
 	option required true
 
diff --git a/po/templates/multiwan.pot b/po/templates/multiwan.pot
index f7baacff4..0df9a88c7 100644
--- a/po/templates/multiwan.pot
+++ b/po/templates/multiwan.pot
@@ -7,11 +7,14 @@ msgstr ""
 msgid "Attempts Before WAN Recovery"
 msgstr ""
 
+msgid "Auto"
+msgstr ""
+
 msgid ""
 "Configure rules for directing outbound traffic through specified WAN Uplinks."
 msgstr ""
 
-msgid "DNS Configuration File"
+msgid "DNS Server(s)"
 msgstr ""
 
 msgid "Default Route"
@@ -77,8 +80,5 @@ msgstr ""
 msgid "WAN Uplink"
 msgstr ""
 
-msgid "Writeable resolv file, dnsmasq defaults to /tmp/resolv.conf.auto"
-msgstr ""
-
 msgid "all"
 msgstr ""
-- 
2.11.0