about summary refs log tree commit diff
path: root/nixpkgs/nixos
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-01-10 13:38:14 +0000
committerAlyssa Ross <hi@alyssa.is>2020-01-10 13:38:14 +0000
commit30a4aefb6a0a6d9d315634eb3cdfb3da95e7dbb3 (patch)
tree2310c41bfe0a8ad3e4982ea1fa9ad13943843506 /nixpkgs/nixos
parent1639b30aba22bd66ba6236387882c9ca983ed20a (diff)
downloadnixlib-30a4aefb6a0a6d9d315634eb3cdfb3da95e7dbb3.tar
nixlib-30a4aefb6a0a6d9d315634eb3cdfb3da95e7dbb3.tar.gz
nixlib-30a4aefb6a0a6d9d315634eb3cdfb3da95e7dbb3.tar.bz2
nixlib-30a4aefb6a0a6d9d315634eb3cdfb3da95e7dbb3.tar.lz
nixlib-30a4aefb6a0a6d9d315634eb3cdfb3da95e7dbb3.tar.xz
nixlib-30a4aefb6a0a6d9d315634eb3cdfb3da95e7dbb3.tar.zst
nixlib-30a4aefb6a0a6d9d315634eb3cdfb3da95e7dbb3.zip
nixos/mailman: move mailman.cfg to /etc/mailman3
Mailman will read its config file from either location, but
mailman-web will only read its config from /etc/mailman3/settings.py.
So, use /etc/mailman3 for mailman.cfg as well, for symmetry.
Diffstat (limited to 'nixpkgs/nixos')
-rw-r--r--nixpkgs/nixos/modules/services/mail/mailman.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/nixos/modules/services/mail/mailman.nix b/nixpkgs/nixos/modules/services/mail/mailman.nix
index 3e977866cc51..e77e33d35dec 100644
--- a/nixpkgs/nixos/modules/services/mail/mailman.nix
+++ b/nixpkgs/nixos/modules/services/mail/mailman.nix
@@ -172,7 +172,7 @@ in {
 
     users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; };
 
-    environment.etc."mailman.cfg".text = mailmanCfg;
+    environment.etc."mailman3/mailman.cfg".text = mailmanCfg;
 
     environment.etc."mailman3/settings.py".text = ''
       import os
@@ -204,7 +204,7 @@ in {
     systemd.services.mailman = {
       description = "GNU Mailman Master Process";
       after = [ "network.target" ];
-      restartTriggers = [ config.environment.etc."mailman.cfg".source ];
+      restartTriggers = [ config.environment.etc."mailman3/mailman.cfg".source ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.mailman}/bin/mailman start";
@@ -276,7 +276,7 @@ in {
     systemd.services.mailman-daily = {
       description = "Trigger daily Mailman events";
       startAt = "daily";
-      restartTriggers = [ config.environment.etc."mailman.cfg".source ];
+      restartTriggers = [ config.environment.etc."mailman3/mailman.cfg".source ];
       serviceConfig = {
         ExecStart = "${pkgs.mailman}/bin/mailman digests --send";
         User = "mailman";