luci-app-sshtunnel: servers: ProxyCommand option

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 255aef1748309d065795f551b1994f2cd807b668)

diff --git a/applications/luci-app-sshtunnel/Makefile b/applications/luci-app-sshtunnel/Makefile
index 4298b6107ff1545a7a744bf28410cc17d3a9cbc7..f686ff103fa45ed89c40aa5aa0d7a490f4dcb556 100644 (file)
--- a/applications/luci-app-sshtunnel/Makefile
+++ b/applications/luci-app-sshtunnel/Makefile
@@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for SSH Tunnels (sshtunnel package)
 
 PKG_MAINTAINER:=Sergey Ponomarev <stokito@gmail.com>
 LUCI_DEPENDS:=+luci-base +sshtunnel
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.0
 PKG_RELEASE:=1
 
 include ../../luci.mk

diff --git a/applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js b/applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js
index 88c3692728b5e3c8464c08fc45f49d458967923e..7a45ddc32b99a64d363e1512004c97842f58e190 100644 (file)
--- a/applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js
+++ b/applications/luci-app-sshtunnel/htdocs/luci-static/resources/view/sshtunnel/ssh_servers.js
@@ -127,6 +127,14 @@ return view.extend({
                o.default = 'accept-new';
                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();
        },
 });