diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-12 12:01:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-12 12:01:25 +0000 |
| commit | f220ef48f81419bf1fd03621b04e9d942b91ef96 (patch) | |
| tree | e4514b6b06e7f363bf46177e8fa1d2fdc72ba4ac /nixos | |
| parent | 1bb67a90bad7f80ece76b3166ac7ab05c36304b0 (diff) | |
| parent | f0dec0b9d3de4327175242df8d43660a637da2fc (diff) | |
| download | nixlib-f220ef48f81419bf1fd03621b04e9d942b91ef96.tar nixlib-f220ef48f81419bf1fd03621b04e9d942b91ef96.tar.gz nixlib-f220ef48f81419bf1fd03621b04e9d942b91ef96.tar.bz2 nixlib-f220ef48f81419bf1fd03621b04e9d942b91ef96.tar.lz nixlib-f220ef48f81419bf1fd03621b04e9d942b91ef96.tar.xz nixlib-f220ef48f81419bf1fd03621b04e9d942b91ef96.tar.zst nixlib-f220ef48f81419bf1fd03621b04e9d942b91ef96.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/mail/mailman.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/mailman.nix | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index ec2a19f58bb1..a61c45a43bb2 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -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"; }; diff --git a/nixos/tests/mailman.nix b/nixos/tests/mailman.nix index 2806e9166d9a..f9b43861a12f 100644 --- a/nixos/tests/mailman.nix +++ b/nixos/tests/mailman.nix @@ -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() ''; } |