Revert "luci-app-sshtunnel: servers: ProxyCommand option"
This reverts commit 24236d5e96.
This commit is contained in:
Paul Donald
parent
7190d1ced4
commit
23df9c2fbf
4 changed files with 27 additions and 35 deletions
|
|
@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for SSH Tunnels (sshtunnel package)
|
||||||
|
|
||||||
PKG_MAINTAINER:=Sergey Ponomarev <stokito@gmail.com>
|
PKG_MAINTAINER:=Sergey Ponomarev <stokito@gmail.com>
|
||||||
LUCI_DEPENDS:=+luci-base +sshtunnel
|
LUCI_DEPENDS:=+luci-base +sshtunnel
|
||||||
PKG_VERSION:=1.1.0
|
PKG_VERSION:=1.0.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
include ../../luci.mk
|
include ../../luci.mk
|
||||||
|
|
|
||||||
|
|
@ -127,14 +127,6 @@ return view.extend({
|
||||||
o.default = 'accept-new';
|
o.default = 'accept-new';
|
||||||
o.modalonly = true;
|
o.modalonly = true;
|
||||||
|
|
||||||
o = s.taboption('advanced', form.Value, 'ProxyCommand', _('Proxy tunnel command'),
|
|
||||||
_('The command to use to connect to the server.') + '<br />' +
|
|
||||||
_('For example, the following command would connect via an HTTP proxy:') + '<br />' +
|
|
||||||
'<code>ncat --proxy-type http --proxy-auth alice:secret --proxy 192.168.1.2:8080 %h %p</code>' +
|
|
||||||
_manSshConfig('ProxyCommand')
|
|
||||||
);
|
|
||||||
o.modalonly = true;
|
|
||||||
|
|
||||||
return m.render();
|
return m.render();
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ msgstr ""
|
||||||
"<code>*</code> значит принимать соединения на всех интерфейсах <b>включая "
|
"<code>*</code> значит принимать соединения на всех интерфейсах <b>включая "
|
||||||
"публичные</b>"
|
"публичные</b>"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:138
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:142
|
||||||
msgid "A key with that name already exists."
|
msgid "A key with that name already exists."
|
||||||
msgstr "Ключ с таким именем уже существует."
|
msgstr "Ключ с таким именем уже существует."
|
||||||
|
|
||||||
|
|
@ -17,7 +17,7 @@ msgstr "Ключ с таким именем уже существует."
|
||||||
msgid "Accept new and check if not changed"
|
msgid "Accept new and check if not changed"
|
||||||
msgstr "Принимать новый и проверять что не изменился"
|
msgstr "Принимать новый и проверять что не изменился"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:123
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:127
|
||||||
msgid "Add the pub key to %s or %s."
|
msgid "Add the pub key to %s or %s."
|
||||||
msgstr "Добавьте этот публичный ключ в %s или в %s."
|
msgstr "Добавьте этот публичный ключ в %s или в %s."
|
||||||
|
|
||||||
|
|
@ -78,7 +78,7 @@ msgstr "Для OpenSSH %s"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:132
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:132
|
||||||
msgid "For example, the following command would connect via an HTTP proxy:"
|
msgid "For example, the following command would connect via an HTTP proxy:"
|
||||||
msgstr "Например с помощью этой команады подключаться через HTTP прокси:"
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_tunnels.js:62
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_tunnels.js:62
|
||||||
msgid "Forward a port on the local host to a service on the remote host."
|
msgid "Forward a port on the local host to a service on the remote host."
|
||||||
|
|
@ -92,11 +92,11 @@ msgstr "Перенаправить порт с удалённого хоста
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Общие настройки"
|
msgstr "Общие настройки"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:116
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:120
|
||||||
msgid "Generate"
|
msgid "Generate"
|
||||||
msgstr "Сгенерировать"
|
msgstr "Сгенерировать"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:97
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:101
|
||||||
msgid "Generate a new key"
|
msgid "Generate a new key"
|
||||||
msgstr "Сгенерировать новый ключ"
|
msgstr "Сгенерировать новый ключ"
|
||||||
|
|
||||||
|
|
@ -117,7 +117,7 @@ msgstr "Идентификационный ключ"
|
||||||
msgid "If not specified then a default will be used."
|
msgid "If not specified then a default will be used."
|
||||||
msgstr "Если не указан то используется ключ по умолчанию."
|
msgstr "Если не указан то используется ключ по умолчанию."
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:125
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:129
|
||||||
msgid ""
|
msgid ""
|
||||||
"In LuCI you can do that with <a %s>System / Administration / SSH-Keys</a>"
|
"In LuCI you can do that with <a %s>System / Administration / SSH-Keys</a>"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -160,8 +160,8 @@ msgstr "Локальный порт"
|
||||||
msgid "Log level"
|
msgid "Log level"
|
||||||
msgstr "Уровень логирования"
|
msgstr "Уровень логирования"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:88
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:92
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:101
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:105
|
||||||
msgid "Name"
|
msgid "Name"
|
||||||
msgstr "Название"
|
msgstr "Название"
|
||||||
|
|
||||||
|
|
@ -188,7 +188,7 @@ msgid "Proxy tunnel command"
|
||||||
msgstr "Команда прокси туннеля"
|
msgstr "Команда прокси туннеля"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_hosts.js:40
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_hosts.js:40
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:89
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:93
|
||||||
msgid "Public Key"
|
msgid "Public Key"
|
||||||
msgstr "Публичный ключ"
|
msgstr "Публичный ключ"
|
||||||
|
|
||||||
|
|
@ -222,7 +222,7 @@ msgstr "Задержка попытки"
|
||||||
msgid "SOCKS proxy via remote host."
|
msgid "SOCKS proxy via remote host."
|
||||||
msgstr "SOCKS прокси через удалённый хост."
|
msgstr "SOCKS прокси через удалённый хост."
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:121
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:125
|
||||||
#: applications/luci-app-sshtunnel/root/usr/share/luci/menu.d/luci-app-sshtunnel.json:14
|
#: applications/luci-app-sshtunnel/root/usr/share/luci/menu.d/luci-app-sshtunnel.json:14
|
||||||
msgid "SSH Keys"
|
msgid "SSH Keys"
|
||||||
msgstr "SSH Ключи"
|
msgstr "SSH Ключи"
|
||||||
|
|
@ -236,7 +236,7 @@ msgstr "SSH Ключи"
|
||||||
msgid "SSH Tunnels"
|
msgid "SSH Tunnels"
|
||||||
msgstr "SSH туннели"
|
msgstr "SSH туннели"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:165
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:169
|
||||||
msgid "See %s."
|
msgid "See %s."
|
||||||
msgstr "См. %s."
|
msgstr "См. %s."
|
||||||
|
|
||||||
|
|
@ -262,8 +262,8 @@ msgid "Strict host key checking"
|
||||||
msgstr "Строгая проверка ключа хоста"
|
msgstr "Строгая проверка ключа хоста"
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:131
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:131
|
||||||
msgid "The command to use to connect to the server."
|
msgid "The command to use to connect to the serve."
|
||||||
msgstr "Комманда через которую подключатся к серверу."
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:94
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:94
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -285,7 +285,7 @@ msgstr ""
|
||||||
msgid "This configures <a %s>SSH Tunnels</a>."
|
msgid "This configures <a %s>SSH Tunnels</a>."
|
||||||
msgstr "Настройка <a %s>SSH туннелей</a>."
|
msgstr "Настройка <a %s>SSH туннелей</a>."
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:157
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:161
|
||||||
msgid "Unable to generate a key: %s"
|
msgid "Unable to generate a key: %s"
|
||||||
msgstr "Ошибка при генерации ключа: %s"
|
msgstr "Ошибка при генерации ключа: %s"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
|
||||||
msgid "<code>*</code> means to listen all interfaces <b>including public</b>."
|
msgid "<code>*</code> means to listen all interfaces <b>including public</b>."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:138
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:142
|
||||||
msgid "A key with that name already exists."
|
msgid "A key with that name already exists."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -15,7 +15,7 @@ msgstr ""
|
||||||
msgid "Accept new and check if not changed"
|
msgid "Accept new and check if not changed"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:123
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:127
|
||||||
msgid "Add the pub key to %s or %s."
|
msgid "Add the pub key to %s or %s."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -88,11 +88,11 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:116
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:120
|
||||||
msgid "Generate"
|
msgid "Generate"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:97
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:101
|
||||||
msgid "Generate a new key"
|
msgid "Generate a new key"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -113,7 +113,7 @@ msgstr ""
|
||||||
msgid "If not specified then a default will be used."
|
msgid "If not specified then a default will be used."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:125
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:129
|
||||||
msgid ""
|
msgid ""
|
||||||
"In LuCI you can do that with <a %s>System / Administration / SSH-Keys</a>"
|
"In LuCI you can do that with <a %s>System / Administration / SSH-Keys</a>"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -154,8 +154,8 @@ msgstr ""
|
||||||
msgid "Log level"
|
msgid "Log level"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:88
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:92
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:101
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:105
|
||||||
msgid "Name"
|
msgid "Name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -182,7 +182,7 @@ msgid "Proxy tunnel command"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_hosts.js:40
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_hosts.js:40
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:89
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:93
|
||||||
msgid "Public Key"
|
msgid "Public Key"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -216,7 +216,7 @@ msgstr ""
|
||||||
msgid "SOCKS proxy via remote host."
|
msgid "SOCKS proxy via remote host."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:121
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:125
|
||||||
#: applications/luci-app-sshtunnel/root/usr/share/luci/menu.d/luci-app-sshtunnel.json:14
|
#: applications/luci-app-sshtunnel/root/usr/share/luci/menu.d/luci-app-sshtunnel.json:14
|
||||||
msgid "SSH Keys"
|
msgid "SSH Keys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -230,7 +230,7 @@ msgstr ""
|
||||||
msgid "SSH Tunnels"
|
msgid "SSH Tunnels"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:165
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:169
|
||||||
msgid "See %s."
|
msgid "See %s."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -256,7 +256,7 @@ msgid "Strict host key checking"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:131
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:131
|
||||||
msgid "The command to use to connect to the server."
|
msgid "The command to use to connect to the serve."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:94
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js:94
|
||||||
|
|
@ -277,7 +277,7 @@ msgstr ""
|
||||||
msgid "This configures <a %s>SSH Tunnels</a>."
|
msgid "This configures <a %s>SSH Tunnels</a>."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:157
|
#: applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_keys.js:161
|
||||||
msgid "Unable to generate a key: %s"
|
msgid "Unable to generate a key: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue