acme-acme.sh: support listen_port option

acme.sh supports --httpport and --tlsport options to be used
together with --standalone and --alpn modes respectively.

This is useful if we're behind a reverse proxy or smth like that
or if we cannot bind to standard 80 or 443 port for some other
reason.

This change makes listen_port from configuration to be passed as
either --httpport or --tlsport

Signed-off-by: Vladimir Kochnev <[email protected]>

diff --git a/net/acme-acmesh/Makefile b/net/acme-acmesh/Makefile
index dbb174ce44ead498f2193d0fafa57ef614bc1598..8eed8d02c2ab83d50aac9d5b5f9163751ae96508 100644 (file)
--- a/net/acme-acmesh/Makefile
+++ b/net/acme-acmesh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-acmesh
 PKG_VERSION:=3.1.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?

diff --git a/net/acme-acmesh/files/hook.sh b/net/acme-acmesh/files/hook.sh
index a29bade1ac45c422047822d01381cfc87994c984..2143594463829930f8d0f22a2da703520c791382 100644 (file)
--- a/net/acme-acmesh/files/hook.sh
+++ b/net/acme-acmesh/files/hook.sh
@@ -124,10 +124,10 @@ get)
                fi
                ;;
        "standalone")
-               set -- "$@" --standalone --listen-v6
+               set -- "$@" --standalone --listen-v6 --httpport "$listen_port"
                ;;
        "alpn")
-               set -- "$@" --alpn --listen-v6
+               set -- "$@" --alpn --listen-v6 --tlsport "$listen_port"
                ;;
        "webroot")
                mkdir -p "$CHALLENGE_DIR"