sslh: use tls option instead of deprecated ssl
Upstream will drop support for the ssl option in the next future version.
Signed-off-by: Gabor Seljan <sgabe@users.noreply.github.com>
(cherry picked from commit 46c253dfca
)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[package bump]
This commit is contained in:
parent
8f935f38bf
commit
267b490878
3 changed files with 10 additions and 7 deletions
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=sslh
|
PKG_NAME:=sslh
|
||||||
PKG_VERSION:=v1.20
|
PKG_VERSION:=v1.20
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://rutschle.net/tech/sslh/
|
PKG_SOURCE_URL:=https://rutschle.net/tech/sslh/
|
||||||
|
|
|
@ -10,9 +10,12 @@ config 'sslh' 'default'
|
||||||
# ssh defaults to 'localhost:22'
|
# ssh defaults to 'localhost:22'
|
||||||
# --ssh <sshhost>:<sshport>
|
# --ssh <sshhost>:<sshport>
|
||||||
option 'ssh' ''
|
option 'ssh' ''
|
||||||
# ssl defaults to 'localhost:443'
|
# http defaults to 'localhost:80'
|
||||||
# --ssl <sslhost>:<sslport>
|
# --http <httphost>:<httpport>
|
||||||
option 'ssl' ''
|
option 'http' ''
|
||||||
|
# tls defaults to 'localhost:443'
|
||||||
|
# --tls <tlshost>:<tlsport>
|
||||||
|
option 'tls' ''
|
||||||
# openvpn defaults to 'localhost:1194'
|
# openvpn defaults to 'localhost:1194'
|
||||||
# --openvpn <openvpnhost>:<openvpnport>
|
# --openvpn <openvpnhost>:<openvpnport>
|
||||||
option 'openvpn' ''
|
option 'openvpn' ''
|
||||||
|
|
|
@ -22,9 +22,9 @@ start_instance() {
|
||||||
# B) ssh parameter
|
# B) ssh parameter
|
||||||
config_get val "${section}" ssh
|
config_get val "${section}" ssh
|
||||||
[ -n "${val}" ] && append args "--ssh ${val}"
|
[ -n "${val}" ] && append args "--ssh ${val}"
|
||||||
# C) ssl parameter
|
# C) tls parameter
|
||||||
config_get val "${section}" ssl
|
config_get val "${section}" tls
|
||||||
[ -n "${val}" ] && append args "--ssl ${val}"
|
[ -n "${val}" ] && append args "--tls ${val}"
|
||||||
# D) openvpn parameter
|
# D) openvpn parameter
|
||||||
config_get val "${section}" openvpn
|
config_get val "${section}" openvpn
|
||||||
[ -n "${val}" ] && append args "--openvpn ${val}"
|
[ -n "${val}" ] && append args "--openvpn ${val}"
|
||||||
|
|
Loading…
Reference in a new issue