Merge pull request #50 from charmoniumQ/patch-1

Changed user setup to work without nginx
timhae · Apr 7, 2024 · 2608e78 · 2608e78
2 parents f1e7a9d + f7968fa
commit 2608e78
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/module/firefly-iii.nix b/module/firefly-iii.nix
@@ -396,7 +396,7 @@ in
           fireflyEnv = pkgs.writeText "firefly-iii.env" (fireflyEnvVars filteredConfig);
         in
         ''
-          set -euo pipefail
+          set -exuo pipefail
           umask 077
 
           # create the .env file
@@ -428,13 +428,19 @@ in
 
     # User management
     users = {
-      users = mkIf (user == defaultUser) {
-        ${defaultUser} = {
-          inherit group;
-          isSystemUser = true;
-        };
-        "${config.services.nginx.user}".extraGroups = [ group ];
-      };
+      users = mkMerge [
+        (mkIf (user == defaultUser) (
+          {
+            ${defaultUser} = {
+              inherit group;
+              isSystemUser = true;
+            };
+          }
+        ))
+        (mkIf config.services.nginx.enable {
+            "${config.services.nginx.user}".extraGroups = [ group ];
+        })
+      ];
       groups = mkIf (group == defaultGroup) {
         ${defaultGroup} = { };
       };