summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2021-07-13 04:05:05 +0200
committerNiklas Hambüchen <mail@nh2.me>2021-07-13 04:05:05 +0200
commit8613698df0674935d4b9c385e2c1a41b64447985 (patch)
tree0c9f2406afca36e355476532c3c408fa9cb8053f /nixos
parent45fc7d4a35c5343e58541a7847f6415654ccbb37 (diff)
downloadnixpkgs-8613698df0674935d4b9c385e2c1a41b64447985.tar
nixpkgs-8613698df0674935d4b9c385e2c1a41b64447985.tar.gz
nixpkgs-8613698df0674935d4b9c385e2c1a41b64447985.tar.bz2
nixpkgs-8613698df0674935d4b9c385e2c1a41b64447985.tar.lz
nixpkgs-8613698df0674935d4b9c385e2c1a41b64447985.tar.xz
nixpkgs-8613698df0674935d4b9c385e2c1a41b64447985.tar.zst
nixpkgs-8613698df0674935d4b9c385e2c1a41b64447985.zip
nixos/plausible: Fix shell scripting errors.
See https://github.com/NixOS/nixpkgs/pull/124055/files#r668271575
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-apps/plausible.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix
index caf5ba466df..846a770cc14 100644
--- a/nixos/modules/services/web-apps/plausible.nix
+++ b/nixos/modules/services/web-apps/plausible.nix
@@ -7,10 +7,15 @@ let
 
   # FIXME consider using LoadCredential as soon as it actually works.
   envSecrets = ''
-    export ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})"
-    export SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})"
+    ADMIN_USER_PWD="$(<${cfg.adminUser.passwordFile})"
+    export ADMIN_USER_PWD # separate export to make `set -e` work
+
+    SECRET_KEY_BASE="$(<${cfg.server.secretKeybaseFile})"
+    export SECRET_KEY_BASE # separate export to make `set -e` work
+
     ${optionalString (cfg.mail.smtp.passwordFile != null) ''
-      export SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})"
+      SMTP_USER_PWD="$(<${cfg.mail.smtp.passwordFile})"
+      export SMTP_USER_PWD # separate export to make `set -e` work
     ''}
   '';
 in {
@@ -228,6 +233,7 @@ in {
             WorkingDirectory = "/var/lib/plausible";
             StateDirectory = "plausible";
             ExecStartPre = "@${pkgs.writeShellScript "plausible-setup" ''
+              set -eu -o pipefail
               ${envSecrets}
               ${pkgs.plausible}/createdb.sh
               ${pkgs.plausible}/migrate.sh
@@ -238,6 +244,7 @@ in {
               ''}
             ''} plausible-setup";
             ExecStart = "@${pkgs.writeShellScript "plausible" ''
+              set -eu -o pipefail
               ${envSecrets}
               plausible start
             ''} plausible";