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

uacme: 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 uacme.

This helps users with more complex use-cases to utilize uacme 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:58:42 +03:00
parent debe65dffe
commit cf6027f0b0
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/uacme/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=uacme PKG_NAME:=uacme
PKG_VERSION:=1.2.1 PKG_VERSION:=1.2.1
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/ndilieto/uacme/tar.gz/upstream/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/ndilieto/uacme/tar.gz/upstream/$(PKG_VERSION)?

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

@ -11,4 +11,6 @@ config cert 'example'
option update_nginx 1 option update_nginx 1
option update_haproxy 1 option update_haproxy 1
option webroot "/www/.well-known/acme-challenge" option webroot "/www/.well-known/acme-challenge"
# option user_setup "path-to-custom-setup.script"
# option user_cleanup "path-to-custom-cleanup.script"
list domains example.org list domains example.org

16
net/uacme/files/run.sh
View file

@ -37,6 +37,7 @@ NGINX_WEBSERVER=0
UPDATE_NGINX=0 UPDATE_NGINX=0
UPDATE_UHTTPD=0 UPDATE_UHTTPD=0
UPDATE_HAPROXY=0 UPDATE_HAPROXY=0
USER_CLEANUP=
. /lib/functions.sh . /lib/functions.sh
@ -168,6 +169,11 @@ post_checks()
/etc/init.d/haproxy restart /etc/init.d/haproxy restart
log "Restarting haproxy..." log "Restarting haproxy..."
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()
@ -207,6 +213,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 staging= local staging=
local HOOK= local HOOK=
@ -220,10 +228,13 @@ 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
UPDATE_HAPROXY=$update_haproxy UPDATE_HAPROXY=$update_haproxy
USER_CLEANUP=$user_cleanup
[ "$enabled" -eq "1" ] || return [ "$enabled" -eq "1" ] || return
@ -237,7 +248,12 @@ issue_cert()
set -- $domains set -- $domains
main_domain=$1 main_domain=$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 [ -n "$webroot" ] || [ -n "$dns" ] || pre_checks "$main_domain" || return 1
fi
log "Running $APP for $main_domain" log "Running $APP for $main_domain"