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

Merge branch 'master' of github.com:NixOS/nixos

Browse Source
This commit is contained in:
Eelco Dolstra 2012-09-21 11:03:25 -04:00
commit 0bd7bdfe0d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/services/mail/dovecot2.nix
View File

@ -14,9 +14,10 @@ let
'' ''
+ (if cfg.sslServerCert!="" then + (if cfg.sslServerCert!="" then
'' ''
ssl_cert_file = ${cfg.sslServerCert} ssl_cert = <${cfg.sslServerCert}
ssl_key_file = ${cfg.sslServerKey} ssl_key = <${cfg.sslServerKey}
ssl_ca_file = ${cfg.sslCACert} ssl_ca = <${cfg.sslCACert}
disable_plaintext_auth = yes
'' else '' '' else ''
ssl = no ssl = no
disable_plaintext_auth = no disable_plaintext_auth = no
@ -40,14 +41,9 @@ let
driver = pam driver = pam
args = dovecot2 args = dovecot2
} }
#auth_debug = yes
#auth_verbose = yes
#debug_log_path = /tmp/dovecot2debug.log
pop3_uidl_format = %08Xv%08Xu pop3_uidl_format = %08Xv%08Xu
'' + cfg.extraConfig;
log_path = /var/log/dovecot2.log
'';
confFile = pkgs.writeText "dovecot.conf" dovecotConf; confFile = pkgs.writeText "dovecot.conf" dovecotConf;
@ -76,6 +72,12 @@ in
description = "Dovecot group name."; description = "Dovecot group name.";
}; };
extraConfig = mkOption {
default = "";
example = "mail_debug = yes";
description = "Additional entries to put verbatim into Dovecot's config file.";
};
mailLocation = mkOption { mailLocation = mkOption {
default = "maildir:/var/spool/mail/%u"; /* Same as inbox, as postfix */ default = "maildir:/var/spool/mail/%u"; /* Same as inbox, as postfix */
example = "maildir:~/mail:INBOX=/var/spool/mail/%u"; example = "maildir:~/mail:INBOX=/var/spool/mail/%u";