diff options
| author | Florian Klink <flokli@flokli.de> | 2019-11-11 01:56:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-11 01:56:24 +0100 |
| commit | 848399f448201d0d2f2096e07c09d86899ccc235 (patch) | |
| tree | 6723343a0b59ad3952aebaad4771c502363c7d90 /nixos/modules | |
| parent | 9b51c5145ad58d49cefdba24d5bc53abb6017143 (diff) | |
| parent | 1c5bfddbc925b368597dff35bbea0f94ea035c88 (diff) | |
| download | nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.gz nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.bz2 nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.lz nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.xz nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.zst nixlib-848399f448201d0d2f2096e07c09d86899ccc235.zip | |
Merge pull request #72390 from flokli/bump-opensmtpd
opensmtpd: 6.4.2p1 -> 6.6.1p1
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/mail/opensmtpd.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index a870550ba50b..1fabe2da45c5 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -101,6 +101,12 @@ in { }; }; + systemd.tmpfiles.rules = [ + "d /var/spool/smtpd 711 root - - -" + "d /var/spool/smtpd/offline 770 root smtpq - -" + "d /var/spool/smtpd/purge 700 smtpq root - -" + ]; + systemd.services.opensmtpd = let procEnv = pkgs.buildEnv { name = "opensmtpd-procs"; @@ -110,18 +116,6 @@ in { in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - preStart = '' - mkdir -p /var/spool/smtpd - chmod 711 /var/spool/smtpd - - mkdir -p /var/spool/smtpd/offline - chown root.smtpq /var/spool/smtpd/offline - chmod 770 /var/spool/smtpd/offline - - mkdir -p /var/spool/smtpd/purge - chown smtpq.root /var/spool/smtpd/purge - chmod 700 /var/spool/smtpd/purge - ''; serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}"; environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; }; |