Browse Source

acme: Allow custom ACME server directory URL

The underlying `acme.sh` allows custom ACME server URLs (using `--server`). Adding the necessary field to specify a custom ACME server URL from UCI.

Signed-off-by: Jannis Pinter <jannis+openwrt@pinterjann.is>
lilik-openwrt-22.03
Jannis Pinter 4 years ago
committed by Jannis Pinter
parent
commit
3f7d03eda6
2 changed files with 8 additions and 1 deletions
  1. +1
    -1
      net/acme/Makefile
  2. +7
    -0
      net/acme/files/run.sh

+ 1
- 1
net/acme/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=acme PKG_NAME:=acme
PKG_VERSION:=2.8.7 PKG_VERSION:=2.8.7
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://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?


+ 7
- 0
net/acme/files/run.sh View File

@ -210,6 +210,7 @@ issue_cert()
local user_cleanup local user_cleanup
local ret local ret
local domain_dir local domain_dir
local acme_server
config_get_bool enabled "$section" enabled 0 config_get_bool enabled "$section" enabled 0
config_get_bool use_staging "$section" use_staging config_get_bool use_staging "$section" use_staging
@ -223,6 +224,7 @@ issue_cert()
config_get dns "$section" dns config_get dns "$section" dns
config_get user_setup "$section" user_setup config_get user_setup "$section" user_setup
config_get user_cleanup "$section" user_cleanup config_get user_cleanup "$section" user_cleanup
config_get acme_server "$section" acme_server
UPDATE_NGINX=$update_nginx UPDATE_NGINX=$update_nginx
UPDATE_UHTTPD=$update_uhttpd UPDATE_UHTTPD=$update_uhttpd
@ -277,6 +279,11 @@ issue_cert()
[ -n "$ACCOUNT_EMAIL" ] && acme_args="$acme_args --accountemail $ACCOUNT_EMAIL" [ -n "$ACCOUNT_EMAIL" ] && acme_args="$acme_args --accountemail $ACCOUNT_EMAIL"
[ "$use_staging" -eq "1" ] && acme_args="$acme_args --staging" [ "$use_staging" -eq "1" ] && acme_args="$acme_args --staging"
if [ -n $acme_server ]; then
log "Using custom ACME server URL"
acme_args="$acme_args --server $acme_server"
fi
if [ -n "$dns" ]; then if [ -n "$dns" ]; then
log "Using dns mode" log "Using dns mode"
acme_args="$acme_args --dns $dns" acme_args="$acme_args --dns $dns"


Loading…
Cancel
Save