diff options
Diffstat (limited to 'applications/luci-app-openvpn/luasrc/model')
3 files changed, 33 insertions, 9 deletions
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua index 2bf36cb27..1971400b8 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua @@ -676,13 +676,37 @@ local knownParams = { "key_method", { 1, 2 }, translate("Enable TLS and assume client role") }, - { Value, + { DynamicList, "tls_cipher", - "DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:RC4-SHA:RC4-MD5:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA:EXP-RC2-CBC-MD5:EXP-RC4-MD5", + { + "DHE-RSA-AES256-SHA", + "DHE-DSS-AES256-SHA", + "AES256-SHA", + "EDH-RSA-DES-CBC3-SHA", + "EDH-DSS-DES-CBC3-SHA", + "DES-CBC3-SHA", + "DHE-RSA-AES128-SHA", + "DHE-DSS-AES128-SHA", + "AES128-SHA", + "RC4-SHA", + "RC4-MD5", + "EDH-RSA-DES-CBC-SHA", + "EDH-DSS-DES-CBC-SHA", + "DES-CBC-SHA", + "EXP-EDH-RSA-DES-CBC-SHA", + "EXP-EDH-DSS-DES-CBC-SHA", + "EXP-DES-CBC-SHA", + "EXP-RC2-CBC-MD5", + "EXP-RC4-MD5" + }, translate("TLS cipher") }, - { Value, + { DynamicList, "tls_ciphersuites", - "TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256", + { + "TLS_AES_256_GCM_SHA384", + "TLS_AES_128_GCM_SHA256", + "TLS_CHACHA20_POLY1305_SHA256" + }, translate("TLS 1.3 or newer cipher") }, { Value, "tls_timeout", @@ -776,7 +800,7 @@ local cts = { } local params = { } local m = Map("openvpn") -m.redirect = luci.dispatcher.build_url("admin", "services", "openvpn") +m.redirect = luci.dispatcher.build_url("admin", "vpn", "openvpn") m.apply_on_parse = true local p = m:section( SimpleSection ) diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua index 132c4d8f9..86a76d5c8 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua @@ -95,7 +95,7 @@ local basicParams = { local m = Map("openvpn") -m.redirect = luci.dispatcher.build_url("admin", "services", "openvpn") +m.redirect = luci.dispatcher.build_url("admin", "vpn", "openvpn") m.apply_on_parse = true local p = m:section( SimpleSection ) diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua index 41266d860..9164f7f60 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua @@ -18,9 +18,9 @@ local cfg = s:option(DummyValue, "config") function cfg.cfgvalue(self, section) local file_cfg = self.map:get(section, "config") if file_cfg then - s.extedit = luci.dispatcher.build_url("admin", "services", "openvpn", "file", "%s") + s.extedit = luci.dispatcher.build_url("admin", "vpn", "openvpn", "file", "%s") else - s.extedit = luci.dispatcher.build_url("admin", "services", "openvpn", "basic", "%s") + s.extedit = luci.dispatcher.build_url("admin", "vpn", "openvpn", "basic", "%s") end end @@ -117,7 +117,7 @@ end local updown = s:option( Button, "_updown", translate("Start/Stop") ) updown._state = false updown.redirect = luci.dispatcher.build_url( - "admin", "services", "openvpn" + "admin", "vpn", "openvpn" ) function updown.cbid(self, section) local pid = s.getPID(section) |