diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-07 04:19:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 04:19:49 +0000 |
| commit | 11df600bf8975a9e1e471f4541321dc6f352a912 (patch) | |
| tree | 5904c5d65122f33a15cd90759748da029aafe1c4 /nixos | |
| parent | 2b499afa63f01473a19c7166c1f3750fa45a1bab (diff) | |
| parent | 7d68eadf373f9962b0e6c9f9299563c543245396 (diff) | |
| download | nixlib-11df600bf8975a9e1e471f4541321dc6f352a912.tar nixlib-11df600bf8975a9e1e471f4541321dc6f352a912.tar.gz nixlib-11df600bf8975a9e1e471f4541321dc6f352a912.tar.bz2 nixlib-11df600bf8975a9e1e471f4541321dc6f352a912.tar.lz nixlib-11df600bf8975a9e1e471f4541321dc6f352a912.tar.xz nixlib-11df600bf8975a9e1e471f4541321dc6f352a912.tar.zst nixlib-11df600bf8975a9e1e471f4541321dc6f352a912.zip | |
Merge pull request #39680 from bgamari/fix-acme-post-stop
nixos/acme: Fix broken post-stop script
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/security/acme.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e430c2ddb903..9e5d636241e9 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -257,7 +257,7 @@ in if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then ${if data.activationDelay != null then '' - + ${data.preDelay} if [ -d '${lpath}' ]; then @@ -266,6 +266,10 @@ in systemctl --wait start acme-setlive-${cert}.service fi '' else data.postRun} + + # noop ensuring that the "if" block is non-empty even if + # activationDelay == null and postRun == "" + true fi ''; @@ -294,7 +298,7 @@ in chown '${data.user}:${data.group}' '${cpath}' fi ''; - script = + script = '' workdir="$(mktemp -d)" |