Commit 1a794a3e authored by Molly Miller's avatar Molly Miller Committed by Alyssa Ross
Browse files

nixos/mailman: store locks in ephemeral runtime directory 

nixosTests.mailman: test mailman master lock handling
parent 6ebe8cd1

nixos/modules/services/mail/mailman.nix

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ in { 
        queue_dir = "$var_dir/queue";

        template_dir = "$var_dir/templates";

        log_dir = "/var/log/mailman";

        lock_dir = "$var_dir/lock";

        lock_dir = "/run/mailman/lock";

        etc_dir = "/etc";

        pid_file = "/run/mailman/master.pid";

      };

nixos/tests/mailman.nix

+6 −0
Original line number Diff line number Diff line
@@ -63,5 +63,11 @@ import ./make-test-python.nix { 
        wait_for_api()

        machine.succeed("curl --fail-with-body -sLSu restadmin:secretpassword http://localhost:8001/3.1/domains")

        machine.succeed("curl --fail-with-body -sILS http://localhost/")



    with subtest("service locking"):

        machine.fail("su -s /bin/sh -c 'mailman start' mailman")

        machine.execute("systemctl kill --signal=SIGKILL mailman")

        machine.succeed("systemctl restart mailman")

        wait_for_api()

  '';

}