mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
net/acme: issue_cert should always call post_checks on exit
issue_cert fuction may return without calling post_checks, which leaves port 80 open and uhttpd configuration is not restored is listen_http was set. Always call post_checks when returning from issue_cert. Signed-off-by: Alexey I. Froloff <raorn@raorn.name>
This commit is contained in:
@@ -180,6 +180,7 @@ issue_cert()
|
|||||||
local failed_dir
|
local failed_dir
|
||||||
local webroot
|
local webroot
|
||||||
local dns
|
local dns
|
||||||
|
local ret
|
||||||
|
|
||||||
config_get_bool enabled "$section" enabled 0
|
config_get_bool enabled "$section" enabled 0
|
||||||
config_get_bool use_staging "$section" use_staging
|
config_get_bool use_staging "$section" use_staging
|
||||||
@@ -211,8 +212,9 @@ issue_cert()
|
|||||||
moved_staging=1
|
moved_staging=1
|
||||||
else
|
else
|
||||||
log "Found previous cert config. Issuing renew."
|
log "Found previous cert config. Issuing renew."
|
||||||
$ACME --home "$STATE_DIR" --renew -d "$main_domain" $acme_args || return 1
|
$ACME --home "$STATE_DIR" --renew -d "$main_domain" $acme_args && ret=0 || ret=1
|
||||||
return 0
|
post_checks
|
||||||
|
return $ret
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -231,6 +233,7 @@ issue_cert()
|
|||||||
else
|
else
|
||||||
if [ ! -d "$webroot" ]; then
|
if [ ! -d "$webroot" ]; then
|
||||||
err "$main_domain: Webroot dir '$webroot' does not exist!"
|
err "$main_domain: Webroot dir '$webroot' does not exist!"
|
||||||
|
post_checks
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
log "Using webroot dir: $webroot"
|
log "Using webroot dir: $webroot"
|
||||||
|
|||||||
Reference in New Issue
Block a user