From 980195277feb11be6e41fc49a38c2b9977b861c0 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Thu, 26 Jan 2017 14:54:48 -0800 Subject: [PATCH] luci-app-vpnbypass: include dnsmasq settings, link to README Signed-off-by: Stan Grishin --- .../luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua | 8 ++++++-- .../luci-app-vpnbypass/po/templates/vpnbypass.pot | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua index 1957948382..2d500b9686 100644 --- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -1,4 +1,4 @@ -m = Map("vpnbypass", translate("VPN Bypass Settings"), translate("Configuration of VPN Bypass Settings")) +m = Map("vpnbypass", translate("VPN Bypass Settings")) s = m:section(NamedSection, "config", "vpnbypass") -- General options @@ -31,5 +31,9 @@ d1 = s:option(DynamicList, "domain", translate("Domains to Bypass"), translate(" d1.addremove = true d1.optional = true -return m +d = Map("dhcp") +s4 = d:section(TypedSection, "dnsmasq") +s4.anonymous = true +di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"), translate("Domains to be accessed directly (outside of the VPN tunnel), see README for syntax")) +return m, d diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot index c0dd33dfbe..9463bc010c 100644 --- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot +++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot @@ -1,10 +1,13 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -msgid "Configuration of VPN Bypass Settings" +msgid "Domains to Bypass" msgstr "" -msgid "Domains to Bypass" +msgid "" +"Domains to be accessed directly (outside of the VPN tunnel), see README for syntax" msgstr "" msgid "Domains which will be accessed directly (outside of the VPN tunnel)" -- 2.30.2