From: Eric Luehrsen <ericluehrsen@hotmail.com>
Date: Mon, 28 May 2018 20:30:50 +0000 (-0400)
Subject: luci-app-unbound: provide transparent defaults with documentation
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F1840%2Fhead;p=project%2Fluci.git

luci-app-unbound: provide transparent defaults with documentation

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
---

diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
index bf2b65a0a1..a2706ffa6c 100644
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
@@ -100,15 +100,6 @@ if valman ~= "1" then
   pfx.optional = true
   pfx:depends({ dns64 = true })
 
-  qry = s1:taboption("basic", Flag, "query_minimize", translate("Query Minimize:"),
-    translate("Break down query components for limited added privacy"))
-  qry.rmempty = false
-
-  qrs = s1:taboption("basic", Flag, "query_min_strict", translate("Strict Minimize:"),
-    translate("Strict version of 'query minimize' but it can break DNS"))
-  qrs.rmempty = false
-  qrs:depends({ query_minimize = true })
-
   prt = s1:taboption("basic", Value, "listen_port", translate("Listening Port:"),
     translate("Choose Unbounds listening port"))
   prt.datatype = "port"
@@ -216,26 +207,39 @@ if valman ~= "1" then
 
   pro = s1:taboption("resource", ListValue, "protocol", translate("Recursion Protocol:"),
     translate("Chose the protocol recursion queries leave on"))
-  pro:value("mixed", translate("IP4 and IP6"))
-  pro:value("ip6_prefer", translate("IP6 Preferred"))
+  pro:value("default", translate("Default"))
   pro:value("ip4_only", translate("IP4 Only"))
   pro:value("ip6_only", translate("IP6 Only"))
+  pro:value("ip6_prefer", translate("IP6 Preferred"))
+  pro:value("mixed", translate("IP4 and IP6"))
   pro.rmempty = false
 
+  rsc = s1:taboption("resource", ListValue, "resource", translate("Memory Resource:"),
+    translate("Use menu System/Processes to observe any memory growth"))
+  rsc:value("default", translate("Default"))
+  rsc:value("tiny", translate("Tiny"))
+  rsc:value("small", translate("Small"))
+  rsc:value("medium", translate("Medium"))
+  rsc:value("large", translate("Large"))
+  rsc.rmempty = false
+
   rsn = s1:taboption("resource", ListValue, "recursion", translate("Recursion Strength:"),
     translate("Recursion activity affects memory growth and CPU load"))
-  rsn:value("aggressive", translate("Aggressive"))
   rsn:value("default", translate("Default"))
   rsn:value("passive", translate("Passive"))
+  rsn:value("aggressive", translate("Aggressive"))
   rsn.rmempty = false
 
-  rsc = s1:taboption("resource", ListValue, "resource", translate("Memory Resource:"),
-    translate("Use menu System/Processes to observe any memory growth"))
-  rsc:value("large", translate("Large"))
-  rsc:value("medium", translate("Medium"))
-  rsc:value("small", translate("Small"))
-  rsc:value("tiny", translate("Tiny"))
-  rsc.rmempty = false
+  qry = s1:taboption("resource", Flag, "query_minimize", translate("Query Minimize:"),
+    translate("Break down query components for limited added privacy"))
+  qry.rmempty = false
+  qry:depends({ recursion = "passive" })
+  qry:depends({ recursion = "aggressive" })
+
+  qrs = s1:taboption("resource", Flag, "query_min_strict", translate("Strict Minimize:"),
+    translate("Strict version of 'query minimize' but it can break DNS"))
+  qrs.rmempty = false
+  qrs:depends({ query_minimize = true })
 
   eds = s1:taboption("resource", Value, "edns_size", translate("EDNS Size:"),
     translate("Limit extended DNS packet size"))