Merge pull request #1008 from stangri/luci-app-vpnbypass

luci-app-vpnbypass: include dnsmasq settings, link to README
This commit is contained in:
Hannu Nyman 2017-02-14 09:26:06 +02:00 committed by GitHub
commit d0dda31644
2 changed files with 11 additions and 4 deletions

View file

@ -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") s = m:section(NamedSection, "config", "vpnbypass")
-- General options -- General options
@ -31,5 +31,9 @@ d1 = s:option(DynamicList, "domain", translate("Domains to Bypass"), translate("
d1.addremove = true d1.addremove = true
d1.optional = 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 <a href='https://github.com/openwrt/packages/tree/master/net/vpnbypass/files#bypass-domains-formatsyntax'>README</a> for syntax"))
return m, d

View file

@ -1,10 +1,13 @@
msgid "" msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8" msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "Configuration of VPN Bypass Settings" msgid "Domains to Bypass"
msgstr "" msgstr ""
msgid "Domains to Bypass" msgid ""
"Domains to be accessed directly (outside of the VPN tunnel), see <a "
"href='https://github.com/openwrt/packages/tree/master/net/vpnbypass/"
"files#bypass-domains-formatsyntax'>README</a> for syntax"
msgstr "" msgstr ""
msgid "Domains which will be accessed directly (outside of the VPN tunnel)" msgid "Domains which will be accessed directly (outside of the VPN tunnel)"