about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorLuke Granger-Brown <git@lukegb.com>2022-09-11 22:45:25 +0100
committerGitHub <noreply@github.com>2022-09-11 22:45:25 +0100
commit9974dcfc2030f9c09048278083f3a068e05b0964 (patch)
tree01d4d361a0a720e8369c7e37c4dd5daa6678a73c /nixos
parentf9544df64514e24bf2913a5462e69fdc1a89e08e (diff)
parent55d9a2c596f08a355c2adaeb5c3225f71bb7a5d5 (diff)
Merge pull request #190717 from lukegb/paperless-tz
nixos/paperless: fix time.timeZone setting
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/paperless.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 0a62af95f8f13..b3b1d265c19ec 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -16,13 +16,13 @@ let
     PAPERLESS_MEDIA_ROOT = cfg.mediaDir;
     PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir;
     GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
-  } // (
-    lib.mapAttrs (_: toString) cfg.extraConfig
-  ) // optionalAttrs (config.time.timeZone != null) {
-    PAPERLESS_TIME_ZONE = lib.mkDefault config.time.timeZone;
+  } // optionalAttrs (config.time.timeZone != null) {
+    PAPERLESS_TIME_ZONE = config.time.timeZone;
   } // optionalAttrs enableRedis {
     PAPERLESS_REDIS = "unix://${redisServer.unixSocket}";
-  };
+  } // (
+    lib.mapAttrs (_: toString) cfg.extraConfig
+  );
 
   manage = let
     setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);