summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-05-23 08:52:42 +0200
committerJoachim Fasting <joachifm@users.noreply.github.com>2016-05-23 08:52:42 +0200
commit89d50c4341a72bc2a0c3c5bfd0ffded30de141ff (patch)
treed657bf8e8b2eb9e5ae81855664c152a5160aee93 /nixos
parentce4f6c215f2f34435638113421dd291a57d16715 (diff)
parente69ed2b64b39e0bf117174cb1ec75c4acc2d211f (diff)
downloadnixlib-89d50c4341a72bc2a0c3c5bfd0ffded30de141ff.tar
nixlib-89d50c4341a72bc2a0c3c5bfd0ffded30de141ff.tar.gz
nixlib-89d50c4341a72bc2a0c3c5bfd0ffded30de141ff.tar.bz2
nixlib-89d50c4341a72bc2a0c3c5bfd0ffded30de141ff.tar.lz
nixlib-89d50c4341a72bc2a0c3c5bfd0ffded30de141ff.tar.xz
nixlib-89d50c4341a72bc2a0c3c5bfd0ffded30de141ff.tar.zst
nixlib-89d50c4341a72bc2a0c3c5bfd0ffded30de141ff.zip
Merge pull request #15630 from obadz/opensmtpd
opensmtpd: 5.7.3p2 -> 5.9.2p1
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/mail/opensmtpd.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 42a1244cde57..e773cdedaea2 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -107,7 +107,16 @@ in {
       wantedBy = [ "multi-user.target" ];
       wants = [ "network.target" ];
       after = [ "network.target" ];
-      preStart = "mkdir -p /var/spool";
+      preStart = ''
+        mkdir -p /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
+        chmod 700 /var/spool/smtpd/purge
+      '';
       serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}";
       environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
     };