diff options
| author | Toke Høiland-Jørgensen <toke@redhat.com> | 2019-10-23 12:21:32 +0200 |
|---|---|---|
| committer | Toke Høiland-Jørgensen <toke@redhat.com> | 2019-10-23 12:26:21 +0200 |
| commit | 7235249df6bdec1e713dbe8816e696eca268effd (patch) | |
| tree | 37b0321fb3c5604639deaf69e58a8bda1ed6c241 /net | |
| parent | cc7014d46079845e129b61fc08399c25cac58e58 (diff) | |
acme: Log acme.sh command invocation
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/acme/Makefile | 2 | ||||
| -rw-r--r-- | net/acme/files/run.sh | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net/acme/Makefile b/net/acme/Makefile index 613d96ebf..b85636f84 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme PKG_VERSION:=2.8.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Neilpang/acme.sh/tar.gz/$(PKG_VERSION)? diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh index b7a6f1899..3d25321d7 100644 --- a/net/acme/files/run.sh +++ b/net/acme/files/run.sh @@ -54,6 +54,12 @@ get_listeners() { done } +run_acme() +{ + debug "Running acme.sh as '$ACME $@'" + $ACME "$@" +} + pre_checks() { main_domain="$1" @@ -218,7 +224,7 @@ issue_cert() moved_staging=1 else log "Found previous cert config. Issuing renew." - $ACME --home "$STATE_DIR" --renew -d "$main_domain" $acme_args && ret=0 || ret=1 + run_acme --home "$STATE_DIR" --renew -d "$main_domain" $acme_args && ret=0 || ret=1 post_checks return $ret fi @@ -246,7 +252,7 @@ issue_cert() acme_args="$acme_args --webroot $webroot" fi - if ! $ACME --home "$STATE_DIR" --issue $acme_args; then + if ! run_acme --home "$STATE_DIR" --issue $acme_args; then failed_dir="$STATE_DIR/${main_domain}.failed-$(date +%s)" err "Issuing cert for $main_domain failed. Moving state to $failed_dir" [ -d "$STATE_DIR/$main_domain" ] && mv "$STATE_DIR/$main_domain" "$failed_dir" |