Skynet/misc_nixos-mailserver
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix passwfile update

Browse source 
Currently oneshot services are not re-run on NixOS activate and that
meant that you needed to manually restart `gen-passwd-file` for new
users to be available.

This commit removes the `gen-passwd-file` service and instead simply
calls the same script in the dovecot2 preStart.
This commit is contained in:
Brian Olsen 2020-06-19 16:02:21 +02:00
parent fb8886547b
commit eb70dd1f55
No known key found for this signature in database
GPG key ID: 029DD8E8B95882E8
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mail-server/dovecot.nix
View file

@ -199,18 +199,9 @@ in
''; '';
}; };
systemd.services.gen-passwd-file = {
serviceConfig = {
ExecStart = genPasswdScript;
Type = "oneshot";
};
};
systemd.services.dovecot2 = { systemd.services.dovecot2 = {
after = [ "gen-passwd-file.service" ];
wants = [ "gen-passwd-file.service" ];
requires = [ "gen-passwd-file.service" ];
preStart = '' preStart = ''
${genPasswdScript}
rm -rf '${stateDir}/imap_sieve' rm -rf '${stateDir}/imap_sieve'
mkdir '${stateDir}/imap_sieve' mkdir '${stateDir}/imap_sieve'
cp -p "${./dovecot/imap_sieve}"/*.sieve '${stateDir}/imap_sieve/' cp -p "${./dovecot/imap_sieve}"/*.sieve '${stateDir}/imap_sieve/'
@ -221,6 +212,6 @@ in
''; '';
}; };
systemd.services.postfix.restartTriggers = [ passwdFile ]; systemd.services.postfix.restartTriggers = [ genPasswdScript ];
}; };
} }