Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

acme: add support for user-provided setup and cleanup scripts

Browse source 
Add possibility for user to provide setup and cleanup scripts for
additional flexibility. Setup-script takes precedence over the built-in
behavior of acme.

This helps users with more complex use-cases to utilize acme to update
certificates without adding complexity to the provided run.sh script.

Signed-off-by: Antti Seppälä <a.seppala@gmail.com>
This commit is contained in:
Antti Seppälä 2020-04-18 22:57:04 +03:00
parent b017fe34dd
commit debe65dffe
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/acme/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=acme PKG_NAME:=acme
PKG_VERSION:=2.8.5 PKG_VERSION:=2.8.5
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/Neilpang/acme.sh/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/Neilpang/acme.sh/tar.gz/$(PKG_VERSION)?

2
net/acme/files/acme.config
View file

@ -11,4 +11,6 @@ config cert 'example'
option update_nginx 1 option update_nginx 1
option webroot "" option webroot ""
option dns "" option dns ""
# option user_setup "path-to-custom-setup.script"
# option user_cleanup "path-to-custom-cleanup.script"
list domains example.org list domains example.org

18
net/acme/files/run.sh
View file

@ -20,6 +20,7 @@ DEBUG=0
NGINX_WEBSERVER=0 NGINX_WEBSERVER=0
UPDATE_NGINX=0 UPDATE_NGINX=0
UPDATE_UHTTPD=0 UPDATE_UHTTPD=0
USER_CLEANUP=
. /lib/functions.sh . /lib/functions.sh
@ -148,6 +149,11 @@ post_checks()
NGINX_WEBSERVER=0 NGINX_WEBSERVER=0
/etc/init.d/nginx restart /etc/init.d/nginx restart
fi fi
if [ -n "$USER_CLEANUP" ] && [ -f "$USER_CLEANUP" ]; then
log "Running user-provided cleanup script from $USER_CLEANUP."
"$USER_CLEANUP" || return 1
fi
} }
err_out() err_out()
@ -190,6 +196,8 @@ issue_cert()
local failed_dir local failed_dir
local webroot local webroot
local dns local dns
local user_setup
local user_cleanup
local ret local ret
local domain_dir local domain_dir
@ -201,9 +209,12 @@ issue_cert()
config_get keylength "$section" keylength config_get keylength "$section" keylength
config_get webroot "$section" webroot config_get webroot "$section" webroot
config_get dns "$section" dns config_get dns "$section" dns
config_get user_setup "$section" user_setup
config_get user_cleanup "$section" user_cleanup
UPDATE_NGINX=$update_nginx UPDATE_NGINX=$update_nginx
UPDATE_UHTTPD=$update_uhttpd UPDATE_UHTTPD=$update_uhttpd
USER_CLEANUP=$user_cleanup
[ "$enabled" -eq "1" ] || return [ "$enabled" -eq "1" ] || return
@ -212,7 +223,12 @@ issue_cert()
set -- $domains set -- $domains
main_domain=$1 main_domain=$1
[ -n "$webroot" ] || [ -n "$dns" ] || pre_checks "$main_domain" || return 1 if [ -n "$user_setup" ] && [ -f "$user_setup" ]; then
log "Running user-provided setup script from $user_setup."
"$user_setup" "$main_domain" || return 1
else
[ -n "$webroot" ] || [ -n "$dns" ] || pre_checks "$main_domain" || return 1
fi
if echo $keylength | grep -q "^ec-"; then if echo $keylength | grep -q "^ec-"; then
domain_dir="$STATE_DIR/${main_domain}_ecc" domain_dir="$STATE_DIR/${main_domain}_ecc"