From 265c1c14728c97a313fee681b92f6ba6db3199d3 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 23 Nov 2014 22:41:29 +0000 Subject: [PATCH] postfix: make 2.11 the default, nixos: update postfix config for 2.11 postfix 2.11 is much more humane with respect to disk writes since it uses sockets (which do not change inodes on accesses) instead of fifos (which do). --- nixos/modules/services/mail/postfix.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 8f75bd8ab5d0..b84c63e6421d 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -96,9 +96,9 @@ let # -o smtpd_sasl_auth_enable=yes # -o smtpd_client_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING - pickup fifo n - n 60 1 pickup + pickup unix n - n 60 1 pickup cleanup unix n - n - 0 cleanup - qmgr fifo n - n 300 1 qmgr + qmgr unix n - n 300 1 qmgr tlsmgr unix - - n 1000? 1 tlsmgr rewrite unix - - n - - trivial-rewrite bounce unix - - n - 0 bounce diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 383b5c3f171e..704f59976937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7767,10 +7767,12 @@ let popa3d = callPackage ../servers/mail/popa3d { }; - postfix = callPackage ../servers/mail/postfix { }; + postfix28 = callPackage ../servers/mail/postfix { }; postfix211 = callPackage ../servers/mail/postfix/2.11.nix { }; + postfix = postfix211; + pulseaudio = callPackage ../servers/pulseaudio { gconf = gnome.GConf; # The following are disabled in the default build, because if this