diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-01-10 07:00:34 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-21 12:53:25 +0300 |
| commit | 70e77f9b53b036edfc9300ce3a16ecc637c5f6c3 (patch) | |
| tree | 001ff0629017f2e55978c2dc0ab45d02f2cf8875 /nixos | |
| parent | 94a43b41af1204f4a87261ddb0820c5c8e3bc2c8 (diff) | |
| download | nixlib-70e77f9b53b036edfc9300ce3a16ecc637c5f6c3.tar nixlib-70e77f9b53b036edfc9300ce3a16ecc637c5f6c3.tar.gz nixlib-70e77f9b53b036edfc9300ce3a16ecc637c5f6c3.tar.bz2 nixlib-70e77f9b53b036edfc9300ce3a16ecc637c5f6c3.tar.lz nixlib-70e77f9b53b036edfc9300ce3a16ecc637c5f6c3.tar.xz nixlib-70e77f9b53b036edfc9300ce3a16ecc637c5f6c3.tar.zst nixlib-70e77f9b53b036edfc9300ce3a16ecc637c5f6c3.zip | |
nixos/dovecot: use new modules directory
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/mail/dovecot.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index c034e5e04700..974dfb708f1b 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -135,7 +135,7 @@ in example = literalExample "[ pkgs.dovecot_pigeonhole ]"; description = '' Symlinks the contents of lib/dovecot of every given package into - /var/lib/dovecot/modules. This will make the given modules available + /etc/dovecot/modules. This will make the given modules available if a dovecot package with the module_dir patch applied (like pkgs.dovecot22, the default) is being used. ''; @@ -200,6 +200,8 @@ in gid = config.ids.gids.dovecot2; }; + environment.etc."dovecot/modules".source = modulesDir; + systemd.services.dovecot2 = { description = "Dovecot IMAP/POP3 server"; @@ -207,11 +209,6 @@ in wants = [ "keys.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - rm -f "${stateDir}/modules" - ln -s "${modulesDir}" "${stateDir}/modules" - ''; - serviceConfig = { ExecStart = "${dovecotPkg}/sbin/dovecot -F -c ${cfg.configFile}"; ExecReload = "${dovecotPkg}/sbin/doveadm reload -c ${cfg.configFile}"; |