alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #39680 from bgamari/fix-acme-post-stop

Browse source 
nixos/acme: Fix broken post-stop script
This commit is contained in:
Matthew Justin Bauer 2018-05-07 04:19:49 +00:00 committed by GitHub
parent 2b499afa63 7d68eadf37
commit 11df600bf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/security/acme.nix
View file

@ -257,7 +257,7 @@ in
if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then
${if data.activationDelay != null then '' ${if data.activationDelay != null then ''
${data.preDelay} ${data.preDelay}
if [ -d '${lpath}' ]; then if [ -d '${lpath}' ]; then
@ -266,6 +266,10 @@ in
systemctl --wait start acme-setlive-${cert}.service systemctl --wait start acme-setlive-${cert}.service
fi fi
'' else data.postRun} '' else data.postRun}
# noop ensuring that the "if" block is non-empty even if
# activationDelay == null and postRun == ""
true
fi fi
''; '';
@ -294,7 +298,7 @@ in
chown '${data.user}:${data.group}' '${cpath}' chown '${data.user}:${data.group}' '${cpath}'
fi fi
''; '';
script = script =
'' ''
workdir="$(mktemp -d)" workdir="$(mktemp -d)"