mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

Merge pull request #10340 from tohojo/acme-upd 

A few updates to acme
This commit is contained in:
Toke Høiland-Jørgensen 2019-10-23 12:39:20 +02:00 committed by GitHub
parent cc7014d460 1653894091
commit 7ce4a5da3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/acme/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=acme
PKG_VERSION:=2.8.1
PKG_RELEASE:=2
PKG_VERSION:=2.8.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/Neilpang/acme.sh/tar.gz/$(PKG_VERSION)?
PKG_HASH:=4fc55b2112058e563616893fefb56c5ff4895a7e6327e9f8416797fdc44d98e3
PKG_HASH:=bdec71377a764919ac277e26d71ef7e24087f7f05171921888b70de6ab6e2cbc
PKG_BUILD_DIR:=$(BUILD_DIR)/acme.sh-$(PKG_VERSION)
PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>

10
net/acme/files/run.sh
View File

@ -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"