diff options
Diffstat (limited to 'applications/luci-app-openvpn')
29 files changed, 83 insertions, 4 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 fa1530026a..1508493f3e 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua @@ -74,6 +74,7 @@ local knownParams = { { Value, "route_gateway", "10.234.1.1", translate("Specify a default gateway for routes") }, { Value, "route_delay", 0, translate("Delay n seconds after connection") }, { Flag, "route_noexec", 0, translate("Don't add routes automatically") }, + { Flag, "route_nopull", 0, translate("Don't pull routes automatically") }, { ListValue, "mtu_disc", { "yes", "maybe", "no" }, translate("Enable Path MTU discovery") }, { Flag, "mtu_test", 0, translate("Empirically measure MTU") }, 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 561b0dd028..e75203db60 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua @@ -24,7 +24,7 @@ local basicParams = { { ListValue,"comp_lzo",{"yes","no","adaptive"}, translate("Use fast LZO compression") }, { Value,"keepalive","10 60", translate("Helper directive to simplify the expression of --ping and --ping-restart in server mode configurations") }, - { ListValue,"proto",{ "udp", "tcp" }, translate("Use protocol") }, + { ListValue,"proto",{ "udp", "udp6", "tcp", "tcp6" }, translate("Use protocol") }, { Flag,"client",0, translate("Configure client mode") }, { Flag,"client_to_client",0, translate("Allow client-to-client traffic") }, diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm index ac5c8936ec..f22cb68c7b 100644 --- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm +++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm @@ -6,14 +6,14 @@ <fieldset class="cbi-section"> <legend> - <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn")%>"><%:Overview%></a> » + <a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> » <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%> </legend> <% if self.mode == "basic" then %> - <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance, "Service")%>"><%:Switch to advanced configuration »%></a> + <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration »%></a> <% else %> - <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "basic", self.instance)%>"><%:« Switch to basic configuration%></a> + <a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:« Switch to basic configuration%></a> <hr style="margin:0.5em 0" /> <%:Configuration category%>: <% for i, c in ipairs(self.categories) do %> diff --git a/applications/luci-app-openvpn/po/ca/openvpn.po b/applications/luci-app-openvpn/po/ca/openvpn.po index 67de6b2d7a..77a9415b60 100644 --- a/applications/luci-app-openvpn/po/ca/openvpn.po +++ b/applications/luci-app-openvpn/po/ca/openvpn.po @@ -154,6 +154,9 @@ msgstr "No heretis les opcions globals enviades pel servidor" msgid "Don't log timestamps" msgstr "No registris les marques horàries" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "No rellegeixis la clau al reiniciar" diff --git a/applications/luci-app-openvpn/po/cs/openvpn.po b/applications/luci-app-openvpn/po/cs/openvpn.po index c5ed42d796..dcb3f33354 100644 --- a/applications/luci-app-openvpn/po/cs/openvpn.po +++ b/applications/luci-app-openvpn/po/cs/openvpn.po @@ -149,6 +149,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/de/openvpn.po b/applications/luci-app-openvpn/po/de/openvpn.po index e6cfdae96d..7dd5020b88 100644 --- a/applications/luci-app-openvpn/po/de/openvpn.po +++ b/applications/luci-app-openvpn/po/de/openvpn.po @@ -152,6 +152,9 @@ msgstr "Nur teilnehmerspezifische Optionen übertragen" msgid "Don't log timestamps" msgstr "Keine Zeitangaben protokollieren" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Schlüssel bei Neustarts beibehalten" diff --git a/applications/luci-app-openvpn/po/el/openvpn.po b/applications/luci-app-openvpn/po/el/openvpn.po index c5368d7b10..401862ffd0 100644 --- a/applications/luci-app-openvpn/po/el/openvpn.po +++ b/applications/luci-app-openvpn/po/el/openvpn.po @@ -153,6 +153,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/en/openvpn.po b/applications/luci-app-openvpn/po/en/openvpn.po index e8d8961af6..e3cf641547 100644 --- a/applications/luci-app-openvpn/po/en/openvpn.po +++ b/applications/luci-app-openvpn/po/en/openvpn.po @@ -152,6 +152,9 @@ msgstr "Don't inherit global push options" msgid "Don't log timestamps" msgstr "Don't log timestamps" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Don't re-read key on restart" diff --git a/applications/luci-app-openvpn/po/es/openvpn.po b/applications/luci-app-openvpn/po/es/openvpn.po index 7c9a2d477e..ade7446515 100644 --- a/applications/luci-app-openvpn/po/es/openvpn.po +++ b/applications/luci-app-openvpn/po/es/openvpn.po @@ -151,6 +151,9 @@ msgstr "No heredar opciones push globales" msgid "Don't log timestamps" msgstr "No guardar en registro horas" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "No releer la clave al rearrancar" diff --git a/applications/luci-app-openvpn/po/fr/openvpn.po b/applications/luci-app-openvpn/po/fr/openvpn.po index cbfd1f50e7..c2726caa06 100644 --- a/applications/luci-app-openvpn/po/fr/openvpn.po +++ b/applications/luci-app-openvpn/po/fr/openvpn.po @@ -161,6 +161,9 @@ msgstr "Ne pas hériter des options d'envoi globales" msgid "Don't log timestamps" msgstr "Ne pas journaliser les horodatages" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Ne pas relire la clef au redémarrage" diff --git a/applications/luci-app-openvpn/po/he/openvpn.po b/applications/luci-app-openvpn/po/he/openvpn.po index 55953b92f6..b7dd90cd0b 100644 --- a/applications/luci-app-openvpn/po/he/openvpn.po +++ b/applications/luci-app-openvpn/po/he/openvpn.po @@ -147,6 +147,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/hu/openvpn.po b/applications/luci-app-openvpn/po/hu/openvpn.po index 3e9391817d..f967d1e7d1 100644 --- a/applications/luci-app-openvpn/po/hu/openvpn.po +++ b/applications/luci-app-openvpn/po/hu/openvpn.po @@ -151,6 +151,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "Időbélyegeket ne naplózza" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/it/openvpn.po b/applications/luci-app-openvpn/po/it/openvpn.po index 0304437a59..59855f1dd2 100644 --- a/applications/luci-app-openvpn/po/it/openvpn.po +++ b/applications/luci-app-openvpn/po/it/openvpn.po @@ -153,6 +153,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "Non loggare il timestamps" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Non rileggere le chiavi al riavvio" diff --git a/applications/luci-app-openvpn/po/ja/openvpn.po b/applications/luci-app-openvpn/po/ja/openvpn.po index dc558a8f33..2b888a468d 100644 --- a/applications/luci-app-openvpn/po/ja/openvpn.po +++ b/applications/luci-app-openvpn/po/ja/openvpn.po @@ -151,6 +151,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "時刻をログに書き込まない" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "再起動時にキーの再読み込みを行わない" diff --git a/applications/luci-app-openvpn/po/ms/openvpn.po b/applications/luci-app-openvpn/po/ms/openvpn.po index 0ed8909361..97b699b661 100644 --- a/applications/luci-app-openvpn/po/ms/openvpn.po +++ b/applications/luci-app-openvpn/po/ms/openvpn.po @@ -146,6 +146,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/no/openvpn.po b/applications/luci-app-openvpn/po/no/openvpn.po index 55953b92f6..b7dd90cd0b 100644 --- a/applications/luci-app-openvpn/po/no/openvpn.po +++ b/applications/luci-app-openvpn/po/no/openvpn.po @@ -147,6 +147,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/pl/openvpn.po b/applications/luci-app-openvpn/po/pl/openvpn.po index 7fa9fe27a6..aa98b8c25a 100644 --- a/applications/luci-app-openvpn/po/pl/openvpn.po +++ b/applications/luci-app-openvpn/po/pl/openvpn.po @@ -152,6 +152,9 @@ msgstr "Nie dziedzicz globalnej opcji push" msgid "Don't log timestamps" msgstr "Nie zapisuj czasu w logu" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Nie wczytuj ponownie klucza podczas restartu" diff --git a/applications/luci-app-openvpn/po/pt-br/openvpn.po b/applications/luci-app-openvpn/po/pt-br/openvpn.po index 27aef002cd..f472337b0e 100644 --- a/applications/luci-app-openvpn/po/pt-br/openvpn.po +++ b/applications/luci-app-openvpn/po/pt-br/openvpn.po @@ -153,6 +153,9 @@ msgstr "Não herdar as opções globais de envio (push)" msgid "Don't log timestamps" msgstr "Não registar a data/hora" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Não reler a chave entre os reinícios" diff --git a/applications/luci-app-openvpn/po/pt/openvpn.po b/applications/luci-app-openvpn/po/pt/openvpn.po index 76d209197b..f69231e6f7 100644 --- a/applications/luci-app-openvpn/po/pt/openvpn.po +++ b/applications/luci-app-openvpn/po/pt/openvpn.po @@ -153,6 +153,9 @@ msgstr "Não herdar as opções globais de envio (push)" msgid "Don't log timestamps" msgstr "Não registar timestamps" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Não reler a chave entre reinicios" diff --git a/applications/luci-app-openvpn/po/ro/openvpn.po b/applications/luci-app-openvpn/po/ro/openvpn.po index 1ca67827c9..50dca5357f 100644 --- a/applications/luci-app-openvpn/po/ro/openvpn.po +++ b/applications/luci-app-openvpn/po/ro/openvpn.po @@ -148,6 +148,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/ru/openvpn.po b/applications/luci-app-openvpn/po/ru/openvpn.po index 8a4635aaec..21ddcfcea4 100644 --- a/applications/luci-app-openvpn/po/ru/openvpn.po +++ b/applications/luci-app-openvpn/po/ru/openvpn.po @@ -155,6 +155,9 @@ msgstr "Не наследовать глобальные параметры push msgid "Don't log timestamps" msgstr "Не записывать отметки времени в журнал" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Не считывать заново ключ при перезапуске" diff --git a/applications/luci-app-openvpn/po/sk/openvpn.po b/applications/luci-app-openvpn/po/sk/openvpn.po index 7c885a8d13..cad751ed9f 100644 --- a/applications/luci-app-openvpn/po/sk/openvpn.po +++ b/applications/luci-app-openvpn/po/sk/openvpn.po @@ -146,6 +146,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/sv/openvpn.po b/applications/luci-app-openvpn/po/sv/openvpn.po index c4e30ac5f3..c475a23821 100644 --- a/applications/luci-app-openvpn/po/sv/openvpn.po +++ b/applications/luci-app-openvpn/po/sv/openvpn.po @@ -147,6 +147,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/templates/openvpn.pot b/applications/luci-app-openvpn/po/templates/openvpn.pot index 8fa13d1556..4fe6af4bfa 100644 --- a/applications/luci-app-openvpn/po/templates/openvpn.pot +++ b/applications/luci-app-openvpn/po/templates/openvpn.pot @@ -139,6 +139,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/tr/openvpn.po b/applications/luci-app-openvpn/po/tr/openvpn.po index dcb0ec4e85..e379636ce8 100644 --- a/applications/luci-app-openvpn/po/tr/openvpn.po +++ b/applications/luci-app-openvpn/po/tr/openvpn.po @@ -146,6 +146,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/uk/openvpn.po b/applications/luci-app-openvpn/po/uk/openvpn.po index e6032373e9..caa42464b2 100644 --- a/applications/luci-app-openvpn/po/uk/openvpn.po +++ b/applications/luci-app-openvpn/po/uk/openvpn.po @@ -150,6 +150,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" diff --git a/applications/luci-app-openvpn/po/vi/openvpn.po b/applications/luci-app-openvpn/po/vi/openvpn.po index 2c19e69f38..d21ef9341f 100644 --- a/applications/luci-app-openvpn/po/vi/openvpn.po +++ b/applications/luci-app-openvpn/po/vi/openvpn.po @@ -152,6 +152,9 @@ msgstr "Đừng thừa hưởng tùy chọn đẩy toàn cầu" msgid "Don't log timestamps" msgstr "Đừng log timestamps" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "Đừng đọc lại key ở chế độ khởi động " diff --git a/applications/luci-app-openvpn/po/zh-cn/openvpn.po b/applications/luci-app-openvpn/po/zh-cn/openvpn.po index 1c210dc607..fc85727591 100644 --- a/applications/luci-app-openvpn/po/zh-cn/openvpn.po +++ b/applications/luci-app-openvpn/po/zh-cn/openvpn.po @@ -151,6 +151,9 @@ msgstr "不继承全局主动发送选项" msgid "Don't log timestamps" msgstr "不记录时间戳" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "服务重启时不重读密钥值" diff --git a/applications/luci-app-openvpn/po/zh-tw/openvpn.po b/applications/luci-app-openvpn/po/zh-tw/openvpn.po index d010f4b50a..60539b6b42 100644 --- a/applications/luci-app-openvpn/po/zh-tw/openvpn.po +++ b/applications/luci-app-openvpn/po/zh-tw/openvpn.po @@ -145,6 +145,9 @@ msgstr "" msgid "Don't log timestamps" msgstr "" +msgid "Don't pull routes automatically" +msgstr "" + msgid "Don't re-read key on restart" msgstr "" |