Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9ef306bb4dc9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 851d5d72a3c8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 8, 2018

  1. dovecot2: added ssl_dh using security.dhparams 

    The 18.03 channel includes dovecot 2.3, which requires ssl_dh to be set.
-> fixes nixcloud/nixcloud-webservices#21
    @qknight @abbradar
    qknight authored and abbradar committed May 8, 2018
    Copy the full SHA
    851d5d7 View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 nixos/modules/services/mail/dovecot.nix
10 changes: 8 additions & 2 deletions nixos/modules/services/mail/dovecot.nix
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ let
ssl_cert = <${cfg.sslServerCert}
ssl_key = <${cfg.sslServerKey}
${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)}
ssl_dh = <${config.security.dhparams.path}/dovecot2.pem
disable_plaintext_auth = yes
'')

@@ -297,10 +298,15 @@ in


config = mkIf cfg.enable {

security.pam.services.dovecot2 = mkIf cfg.enablePAM {};

services.dovecot2.protocols =
security.dhparams = mkIf (! isNull cfg.sslServerCert) {
enable = true;
params = {
dovecot2 = 2048;
};
};
services.dovecot2.protocols =
optional cfg.enableImap "imap"
++ optional cfg.enablePop3 "pop3"
++ optional cfg.enableLmtp "lmtp";