summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-02-26 12:23:54 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2018-02-26 12:23:54 +0100
commit585f19fca1201bc170e8fab3b7f52ae33704714e (patch)
tree5e3ae12e473f92ecc631f43c1caf8bd69646b757
parent5d045cbaf80738c752912f3694c4de6487252e2a (diff)
downloadnixos-585f19fca1201bc170e8fab3b7f52ae33704714e.tar
nixos-585f19fca1201bc170e8fab3b7f52ae33704714e.tar.gz
nixos-585f19fca1201bc170e8fab3b7f52ae33704714e.tar.bz2
nixos-585f19fca1201bc170e8fab3b7f52ae33704714e.tar.xz
nixos-585f19fca1201bc170e8fab3b7f52ae33704714e.zip
Move mls to better place
-rw-r--r--ymir.nix9
1 files 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 {
636 privileged = true; 636 privileged = true;
637 chroot = false; 637 chroot = false;
638 command = "pipe"; 638 command = "pipe";
639 args = [ "flags=ORhu" "user=mlmmj" ''argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/''${user}'' ]; 639 args = [ "flags=ORhu" "user=mlmmj" ''argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /srv/mail/lists/''${user}'' ];
640 }; 640 };
641 mlmmj-subs = { 641 mlmmj-subs = {
642 type = "unix"; 642 type = "unix";
@@ -644,7 +644,7 @@ in rec {
644 privileged = true; 644 privileged = true;
645 chroot = false; 645 chroot = false;
646 command = "pipe"; 646 command = "pipe";
647 args = [ "flags=Fqhu" "user=mlmmj" ''argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension}'' ]; 647 args = [ "flags=Fqhu" "user=mlmmj" ''argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /srv/mail/lists/''${user} ''${extension}'' ];
648 }; 648 };
649 policy-spf = { 649 policy-spf = {
650 type = "unix"; 650 type = "unix";
@@ -689,7 +689,7 @@ in rec {
689 serviceConfig = { 689 serviceConfig = {
690 User = "mlmmj"; 690 User = "mlmmj";
691 Group = "mlmmj"; 691 Group = "mlmmj";
692 ExecStart = "${pkgs.mlmmj}/bin/mlmmj-maintd -F -d /var/spool/lists"; 692 ExecStart = "${pkgs.mlmmj}/bin/mlmmj-maintd -F -d /srv/mail/lists";
693 }; 693 };
694 }; 694 };
695 695
@@ -794,9 +794,10 @@ in rec {
794 794
795 users.extraUsers."mlmmj" = { 795 users.extraUsers."mlmmj" = {
796 isSystemUser = true; 796 isSystemUser = true;
797 home = "/var/spool/lists"; 797 home = "/srv/mail/lists";
798 createHome = true; 798 createHome = true;
799 group = "mlmmj"; 799 group = "mlmmj";
800 extraGroups = [ "mail" ];
800 }; 801 };
801 802
802 users.extraGroups."mlmmj" = {}; 803 users.extraGroups."mlmmj" = {};