MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #5627 from oxij/update-postfix

Browse source 
postfix: make 2.11 the default, nixos: update postfix config for 2.11
This commit is contained in:
Peter Simons 2015-01-11 11:28:31 +01:00
commit 43bae26b33
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/mail/postfix.nix
View file

@ -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

4
pkgs/top-level/all-packages.nix
View file

@ -7802,10 +7802,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