From 585f19fca1201bc170e8fab3b7f52ae33704714e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 26 Feb 2018 12:23:54 +0100
Subject: Move mls to better place

---
 ymir.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ymir.nix b/ymir.nix
index 12c72049..cd3e45b5 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -636,7 +636,7 @@ in rec {
         privileged = true;
         chroot = false;
         command = "pipe";
-        args = [ "flags=ORhu" "user=mlmmj" ''argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/''${user}'' ];
+        args = [ "flags=ORhu" "user=mlmmj" ''argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /srv/mail/lists/''${user}'' ];
       };
       mlmmj-subs = {
         type = "unix";
@@ -644,7 +644,7 @@ in rec {
         privileged = true;
         chroot = false;
         command = "pipe";
-        args = [ "flags=Fqhu" "user=mlmmj" ''argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension}'' ];
+        args = [ "flags=Fqhu" "user=mlmmj" ''argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /srv/mail/lists/''${user} ''${extension}'' ];
       };
       policy-spf = {
         type = "unix";
@@ -689,7 +689,7 @@ in rec {
     serviceConfig = {
       User = "mlmmj";
       Group = "mlmmj";
-      ExecStart = "${pkgs.mlmmj}/bin/mlmmj-maintd -F -d /var/spool/lists";
+      ExecStart = "${pkgs.mlmmj}/bin/mlmmj-maintd -F -d /srv/mail/lists";
     };
   };
 
@@ -794,9 +794,10 @@ in rec {
 
   users.extraUsers."mlmmj" = {
     isSystemUser = true;
-    home = "/var/spool/lists";
+    home = "/srv/mail/lists";
     createHome = true;
     group = "mlmmj";
+    extraGroups = [ "mail" ];
   };
 
   users.extraGroups."mlmmj" = {};
-- 
cgit v1.2.3