From facdbe215ae2221cd31003627901803baca5db8f Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sun, 30 Mar 2025 13:09:45 +0200 Subject: modules/mail: Avoid changing the `virtualMail` user uid We would need to set the `vmailUID` option to this value and even then some parts of SNM would still hardcode the default of 5000. Considering that we are in the process of phasing out SNM, this does not seem to be a worthwhile endeavour. --- modules/by-name/co/constants/module.nix | 2 -- modules/by-name/ma/mail/module.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/modules/by-name/co/constants/module.nix b/modules/by-name/co/constants/module.nix index c55a736..d601e70 100644 --- a/modules/by-name/co/constants/module.nix +++ b/modules/by-name/co/constants/module.nix @@ -38,7 +38,6 @@ redis-stalwart-mail = 235; mastodon = 236; stalwart-mail = 238; - virtualMail = 240; acme = 328; dhcpcd = 329; nscd = 330; @@ -72,7 +71,6 @@ sshd stalwart-mail systemd-oom - virtualMail ; # Keep this sorted with `!sort --numeric-sort --key=2 --field-separator="="` diff --git a/modules/by-name/ma/mail/module.nix b/modules/by-name/ma/mail/module.nix index d458291..4df3b1d 100644 --- a/modules/by-name/ma/mail/module.nix +++ b/modules/by-name/ma/mail/module.nix @@ -156,13 +156,11 @@ in { knot-resolver.uid = config.vhack.constants.ids.uids.knot-resolver; redis-rspamd.uid = config.vhack.constants.ids.uids.redis-rspamd; rspamd.uid = config.vhack.constants.ids.uids.rspamd; - virtualMail.uid = lib.mkForce config.vhack.constants.ids.uids.virtualMail; }; groups = { knot-resolver.gid = lib.mkForce config.vhack.constants.ids.gids.knot-resolver; redis-rspamd.gid = config.vhack.constants.ids.gids.redis-rspamd; rspamd.gid = config.vhack.constants.ids.gids.rspamd; - virtualMail.gid = lib.mkForce config.vhack.constants.ids.gids.virtualMail; }; }; }; -- cgit 1.4.1