cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12616 from andersk/acme-19.07

Browse Source 
Backport acme fixes from #11968 to 19.07
This commit is contained in:
Toke Høiland-Jørgensen
2020-06-26 11:21:12 +02:00
committed by GitHub
parent 17e12ad796 f51ec94f86
commit 0ea1e213e7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/acme/Makefile
+1 -1
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:=2 PKG_RELEASE:=3
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)?
net/acme/files/run.sh
+6 -3
View File
@@ -32,17 +32,17 @@ check_cron()
log() log()
{ {
logger -t acme -s -p daemon.info "$@" logger -t acme -s -p daemon.info -- "$@"
} }
err() err()
{ {
logger -t acme -s -p daemon.err "$@" logger -t acme -s -p daemon.err -- "$@"
} }
debug() debug()
{ {
[ "$DEBUG" -eq "1" ] && logger -t acme -s -p daemon.debug "$@" [ "$DEBUG" -eq "1" ] && logger -t acme -s -p daemon.debug -- "$@"
} }
get_listeners() { get_listeners() {
@@ -183,6 +183,7 @@ issue_cert()
local update_uhttpd local update_uhttpd
local update_nginx local update_nginx
local keylength local keylength
local keylength_ecc=0
local domains local domains
local main_domain local main_domain
local moved_staging=0 local moved_staging=0
@@ -215,6 +216,7 @@ issue_cert()
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"
keylength_ecc=1
else else
domain_dir="$STATE_DIR/${main_domain}" domain_dir="$STATE_DIR/${main_domain}"
fi fi
@@ -234,6 +236,7 @@ issue_cert()
moved_staging=1 moved_staging=1
else else
log "Found previous cert config. Issuing renew." log "Found previous cert config. Issuing renew."
[ "$keylength_ecc" -eq "1" ] && acme_args="$acme_args --ecc"
run_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 post_checks
return $ret return $ret