diff options
Diffstat (limited to 'applications/luci-app-vpnbypass')
7 files changed, 33 insertions, 34 deletions
diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile index 0ca74ae38a..838840e6b0 100644 --- a/applications/luci-app-vpnbypass/Makefile +++ b/applications/luci-app-vpnbypass/Makefile @@ -7,9 +7,10 @@ PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> LUCI_TITLE:=VPN Bypass Web UI -LUCI_DEPENDS:=+vpnbypass +LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service. +LUCI_DEPENDS:=+luci +vpnbypass LUCI_PKGARCH:=all -PKG_RELEASE:=1 +PKG_RELEASE:=3 include ../../luci.mk diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua index bb27b63818..9d2f5f425c 100644 --- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -4,19 +4,11 @@ m = Map("vpnbypass", translate("VPN Bypass Settings")) s = m:section(NamedSection, "config", "vpnbypass") -- General options -e = s:option(Flag, "enabled", translate("Enable/start service")) +e = s:option(Flag, "enabled", translate("Start VPNBypass service")) e.rmempty = false - -function e.cfgvalue(self, section) - return self.map:get(section, "enabled") == "1" and luci.sys.init.enabled("vpnbypass") and self.enabled or self.disabled -end - function e.write(self, section, value) - if value == "1" then - luci.sys.call("/etc/init.d/vpnbypass enable >/dev/null") - luci.sys.call("/etc/init.d/vpnbypass start >/dev/null") - else - luci.sys.call("/etc/init.d/vpnbypass stop >/dev/null") + if value ~= "1" then + luci.sys.init.stop("vpnbypass") end return Flag.write(self, section, value) end diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po index 9f3fa2a679..4fa07f9999 100644 --- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po @@ -18,9 +18,6 @@ msgstr "Domínios para evitar a VPN" msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" -msgid "Enable/start service" -msgstr "" - msgid "Local IP Addresses to Bypass" msgstr "" @@ -52,6 +49,9 @@ msgstr "Portas remotas para evitar a VPN" msgid "Remote ports to trigger VPN Bypass" msgstr "Portas remotas para disparar o VPN Bypass" +msgid "Start VPNBypass service" +msgstr "" + msgid "VPN Bypass" msgstr "VPN Bypass" diff --git a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po index 696cb0ea8c..05e21935a0 100644 --- a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po @@ -3,7 +3,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: LuCI: vpnbypass\n" "POT-Creation-Date: 2018-01-01 21:00+0300\n" -"PO-Revision-Date: 2018-01-15 14:15+0300\n" +"PO-Revision-Date: 2018-01-22 13:17+0300\n" "Language-Team: http://cyber-place.ru\n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,9 +21,6 @@ msgstr "Домены, для<br />обхода блокировки" msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "Домены должны быть доступны напрямую (вне VPN-туннеля), см." -msgid "Enable/start service" -msgstr "Включить/Запустить сервис" - msgid "Local IP Addresses to Bypass" msgstr "Локальный IP-адрес<br />обхода VPN" @@ -31,14 +28,14 @@ msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" msgstr "" -"Локальные IP-адреса или подсети с прямым доступом в интернет (вне VPN-" +"Локальные IP-адреса или подсети с прямым доступом в Интернет (вне VPN-" "туннеля)." msgid "Local Ports to Bypass" -msgstr "Локальные порты для запуска обхода VPN" +msgstr "Локальные порты<br />для обхода VPN" msgid "Local ports to trigger VPN Bypass" -msgstr "Локальные порты<br />для обхода VPN" +msgstr "Локальные порты для запуска обхода VPN." msgid "README" msgstr "Описание" @@ -57,7 +54,10 @@ msgid "Remote Ports to Bypass" msgstr "Удаленные порты<br />для обхода VPN" msgid "Remote ports to trigger VPN Bypass" -msgstr "Удаленные порты для запуска обхода VPN" +msgstr "Удаленные порты для запуска обхода VPN." + +msgid "Start VPNBypass service" +msgstr "Запуск сервиса VPNBypass" msgid "VPN Bypass" msgstr "Обход VPN" @@ -66,4 +66,4 @@ msgid "VPN Bypass Settings" msgstr "Настройка обхода VPN" msgid "for syntax" -msgstr " для синтаксиса" +msgstr "для синтаксиса." diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot index fd92b5e8a8..c14c02fe9f 100644 --- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot +++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot @@ -7,9 +7,6 @@ msgstr "" msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" -msgid "Enable/start service" -msgstr "" - msgid "Local IP Addresses to Bypass" msgstr "" @@ -41,6 +38,9 @@ msgstr "" msgid "Remote ports to trigger VPN Bypass" msgstr "" +msgid "Start VPNBypass service" +msgstr "" + msgid "VPN Bypass" msgstr "" diff --git a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po index a1539171fc..72c55a6c81 100644 --- a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po @@ -17,9 +17,6 @@ msgstr "要绕过的域" msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "要直接访问的域（不使用 VPN 隧道），请参见" -msgid "Enable/start service" -msgstr "启用/启动服务" - msgid "Local IP Addresses to Bypass" msgstr "要绕过的本地 IP 地址" @@ -51,6 +48,9 @@ msgstr "要绕过的远程端口" msgid "Remote ports to trigger VPN Bypass" msgstr "触发 VPN 绕过的远程端口" +msgid "Start VPNBypass service" +msgstr "" + msgid "VPN Bypass" msgstr "VPN 绕过" @@ -59,3 +59,6 @@ msgstr "VPN 绕过设置" msgid "for syntax" msgstr "对于语法" + +#~ msgid "Enable/start service" +#~ msgstr "启用/启动服务" diff --git a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po index 90ba85f7ce..9eb3812110 100644 --- a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po @@ -17,9 +17,6 @@ msgstr "要繞過的域" msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "要直接訪問的域（不使用 VPN 隧道），請參見" -msgid "Enable/start service" -msgstr "啟用/啟動服務" - msgid "Local IP Addresses to Bypass" msgstr "要繞過的本地 IP 位址" @@ -51,6 +48,9 @@ msgstr "要繞過的遠端埠" msgid "Remote ports to trigger VPN Bypass" msgstr "觸發 VPN 繞過的遠端埠" +msgid "Start VPNBypass service" +msgstr "" + msgid "VPN Bypass" msgstr "VPN 繞過" @@ -59,3 +59,6 @@ msgstr "VPN 繞過設定" msgid "for syntax" msgstr "對於語法" + +#~ msgid "Enable/start service" +#~ msgstr "啟用/啟動服務" |