Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #19879 from hgl/acme

Browse source 
acme: simplify flock usage
This commit is contained in:
Toke Høiland-Jørgensen 2022-11-11 14:48:50 +01:00 committed by GitHub
commit 23dd1fac75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/acme-common/files/acme.sh
View file

@ -117,15 +117,6 @@ load_globals() {
return 1 return 1
} }
cmd_get() {
trap cleanup EXIT
config_load acme
config_foreach load_globals acme
config_foreach get_cert cert
}
usage() { usage() {
cat <<EOF cat <<EOF
Usage: acme <command> [arguments] Usage: acme <command> [arguments]
@ -143,13 +134,18 @@ fi
case $1 in case $1 in
get) get)
mkdir -p $run_dir mkdir -p $run_dir
{ exec 200>$run_dir/lock
if ! flock -n 200; then if ! flock -n 200; then
log err "Another ACME instance is already running." log err "Another ACME instance is already running."
exit 1 exit 1
fi fi
cmd_get "$@"
} 200>$run_dir/lock trap cleanup EXIT
config_load acme
config_foreach load_globals acme
config_foreach get_cert cert
;; ;;
*) *)
usage usage