summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-11-07 13:30:34 +0100
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-11-07 13:30:34 +0100
commit3510a46be9442f300f9115bf9ecd2c2a99024906 (patch)
tree3d447c119228bebe78215a2b178291ba3add0719
parent8da92243cc8c0c20dd79e7aa738149feaed921f7 (diff)
downloadnixos-3510a46be9442f300f9115bf9ecd2c2a99024906.tar
nixos-3510a46be9442f300f9115bf9ecd2c2a99024906.tar.gz
nixos-3510a46be9442f300f9115bf9ecd2c2a99024906.tar.bz2
nixos-3510a46be9442f300f9115bf9ecd2c2a99024906.tar.xz
nixos-3510a46be9442f300f9115bf9ecd2c2a99024906.zip
Revert "username format"
This reverts commit 8da92243cc8c0c20dd79e7aa738149feaed921f7.
-rw-r--r--ymir.nix11
1 files changed, 1 insertions, 10 deletions
diff --git a/ymir.nix b/ymir.nix
index 96592639..eca08f40 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -522,7 +522,7 @@ in rec {
522 enableImap = true; 522 enableImap = true;
523 enableLmtp = true; 523 enableLmtp = true;
524 enablePop3 = false; 524 enablePop3 = false;
525 enablePAM = false; 525 enablePAM = true;
526 sslServerCert = "/var/lib/acme/yggdrasil.li/fullchain.pem"; 526 sslServerCert = "/var/lib/acme/yggdrasil.li/fullchain.pem";
527 sslServerKey = "/var/lib/acme/yggdrasil.li/key.pem"; 527 sslServerKey = "/var/lib/acme/yggdrasil.li/key.pem";
528 mailLocation = "maildir:~/mail:LAYOUT=index:UTF-8"; 528 mailLocation = "maildir:~/mail:LAYOUT=index:UTF-8";
@@ -532,15 +532,6 @@ in rec {
532 postmaster_address = postmaster@yggdrasil.li 532 postmaster_address = postmaster@yggdrasil.li
533 recipient_delimiter = + 533 recipient_delimiter = +
534 534
535 userdb {
536 driver = passwd
537 }
538
539 passdb {
540 driver = pam
541 args = username_format=%n dovecot2
542 }
543
544 service auth { 535 service auth {
545 unix_listener /var/lib/postfix/queue/private/dovecot-auth { 536 unix_listener /var/lib/postfix/queue/private/dovecot-auth {
546 mode = 0600 537 mode = 0600