Skip to content

Commit

Permalink
sslh: use tls option instead of deprecated ssl
Browse files Browse the repository at this point in the history
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 46c253d)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[package bump]
  • Loading branch information
sgabe authored and BKPepe committed Jun 5, 2020
1 parent 8f935f3 commit 267b490
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion net/sslh/Makefile
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=sslh
PKG_VERSION:=v1.20
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://rutschle.net/tech/sslh/
Expand Down
9 changes: 6 additions & 3 deletions net/sslh/files/sslh.config
Expand Up @@ -10,9 +10,12 @@ config 'sslh' 'default'
# ssh defaults to 'localhost:22'
# --ssh <sshhost>:<sshport>
option 'ssh' ''
# ssl defaults to 'localhost:443'
# --ssl <sslhost>:<sslport>
option 'ssl' ''
# http defaults to 'localhost:80'
# --http <httphost>:<httpport>
option 'http' ''
# tls defaults to 'localhost:443'
# --tls <tlshost>:<tlsport>
option 'tls' ''
# openvpn defaults to 'localhost:1194'
# --openvpn <openvpnhost>:<openvpnport>
option 'openvpn' ''
Expand Down
6 changes: 3 additions & 3 deletions net/sslh/files/sslh.init
Expand Up @@ -22,9 +22,9 @@ start_instance() {
# B) ssh parameter
config_get val "${section}" ssh
[ -n "${val}" ] && append args "--ssh ${val}"
# C) ssl parameter
config_get val "${section}" ssl
[ -n "${val}" ] && append args "--ssl ${val}"
# C) tls parameter
config_get val "${section}" tls
[ -n "${val}" ] && append args "--tls ${val}"
# D) openvpn parameter
config_get val "${section}" openvpn
[ -n "${val}" ] && append args "--openvpn ${val}"
Expand Down

0 comments on commit 267b490

Please sign in to comment.