From c348c6a84c238c2ef4b0765c6507780047021414 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 20 Jun 2020 22:43:22 +0200
Subject: ...

---
 ymir.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/ymir.nix b/ymir.nix
index 87afc1ba..dd5401e5 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -283,12 +283,7 @@ in rec {
                    ];
     extraConfig = ''
       reload_modules = { "group", "tls" }
-      authentication="custom"
-      custom_alias_file="/etc/prosody/aliases"
-      custom_alias_secret_file="/etc/prosody/alias_secret"
-
-      Component "alias.xmpp.li"
-        Include "/etc/prosody/alias.xmpp.li.cfg.lua"
+      authentication="pam"
 
       Component "proxy.xmpp.li" "proxy65"
         proxy65_acl = {"xmpp.li", "yggdrasil.li", "praseodym.org", "141.li", "nights.email"};
@@ -312,10 +307,8 @@ in rec {
     ];
   };
   security.pam.services."xmpp".text = ''
-    auth    requisite                   pam_succeed_if.so user ingroup xmpp
-    auth    [success=1 default=ignore]  pam_unix.so sha512 nodelay
-    auth    requisite                   pam_deny.so
-    auth    required                    pam_permit.so
+    auth requisite  pam_succeed_if.so user ingroup xmpp
+    auth required   pam_unix.so audit
   '';
   users.groups."shadow" = {
     members = [ "prosody"
-- 
cgit v1.2.3