OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11968 from yangfl/master 

acme: fix some errors
This commit is contained in:
Toke Høiland-Jørgensen 2020-04-29 11:24:32 +02:00 committed by GitHub
parent a28ffb1ee2 2e0f44bb34
commit 62ef2a8839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/acme/files/run.sh
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