Merge pull request #79 from nixcloud/fgaz/some-21.11-stuff

some 21.11 stuff
nixcloud · Mar 22, 2022 · 1ae30df · 1ae30df
2 parents 7e421fe + f74fb54
commit 1ae30df
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/modules/services/TLS/default.nix b/modules/services/TLS/default.nix
@@ -305,12 +305,18 @@ in
       }
     ];
 
-    users.groups = fold (identifier: con: con // {
+    users.groups = (fold (identifier: con: con // {
       "${filterIdentifier identifier}" = let c = config.nixcloud.TLS.certs.${identifier}; in { members = c.users; };
-    }) {} (attrNames config.nixcloud.TLS.certs);
+    }) {} (attrNames config.nixcloud.TLS.certs))
+    // optionalAttrs (acmeSupplied != []) {
+      nixcloud-lego-user = {};
+    };
 
     users.users = optionalAttrs (acmeSupplied != []) {
-      nixcloud-lego-user = {};
+      nixcloud-lego-user = {
+        isSystemUser = true;
+        group = "nixcloud-lego-user";
+      };
     };
 
     systemd.services = listToAttrs (selfsignedTargets ++ userSuppliedTargets ++ acmeSupplied ++ acmeSuppliedPreliminary);

diff --git a/modules/services/email/nixcloud-email.nix b/modules/services/email/nixcloud-email.nix
@@ -621,27 +621,27 @@ in {
           after = "${./dovecot}/sieve/file-spam.sieve";
         };
 
-        mailboxes = [
-          { name = "Trash";
+        mailboxes = {
+          Trash = {
             auto = "create";
             specialUse = "Trash";
-          }
+          };
 
-          { name = "Drafts";
+          Drafts = {
             auto = "create";
             specialUse = "Drafts";
-          }
+          };
 
-          { name = "Sent";
+          Sent = {
             auto = "create";
             specialUse = "Sent";
-          }
+          };
 
-          { name = "Spam";
+          Spam = {
             auto = "create";
             specialUse = "Junk";
-          }
-        ];
+          };
+        };
 
         extraConfig = lib.optionalString (cfg.enableTLS) ''
           # https://github.com/nixcloud/nixcloud-webservices/issues/21

diff --git a/modules/services/email/postfix.nix b/modules/services/email/postfix.nix
@@ -675,6 +675,7 @@ in
       services.pfix-srsd.enable = config.services.postfix.useSrs;
 
       services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
+        owner = "nobody";
         program = "sendmail";
         source = "${pkgs.postfix}/bin/sendmail";
         group = setgidGroup;

diff --git a/modules/services/reverse-proxy/default.nix b/modules/services/reverse-proxy/default.nix
@@ -393,7 +393,10 @@ in
     };
 
 
-    users.extraUsers."${user}".group = "${group}";
+    users.extraUsers."${user}" = {
+      group = "${group}";
+      isSystemUser = true;
+    };
 
     users.extraGroups."${user}" = {};