public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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_sasl_auth_enable=yes
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject # -o smtpd_client_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING # -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 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 tlsmgr unix - - n 1000? 1 tlsmgr
rewrite unix - - n - - trivial-rewrite rewrite unix - - n - - trivial-rewrite
bounce unix - - n - 0 bounce bounce unix - - n - 0 bounce

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

@ -7802,10 +7802,12 @@ let
popa3d = callPackage ../servers/mail/popa3d { }; popa3d = callPackage ../servers/mail/popa3d { };
postfix = callPackage ../servers/mail/postfix { }; postfix28 = callPackage ../servers/mail/postfix { };
postfix211 = callPackage ../servers/mail/postfix/2.11.nix { }; postfix211 = callPackage ../servers/mail/postfix/2.11.nix { };
postfix = postfix211;
pulseaudio = callPackage ../servers/pulseaudio { pulseaudio = callPackage ../servers/pulseaudio {
gconf = gnome.GConf; gconf = gnome.GConf;
# The following are disabled in the default build, because if this # The following are disabled in the default build, because if this