summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ymir.nix13
1 files 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 {
283 ]; 283 ];
284 extraConfig = '' 284 extraConfig = ''
285 reload_modules = { "group", "tls" } 285 reload_modules = { "group", "tls" }
286 authentication="custom" 286 authentication="pam"
287 custom_alias_file="/etc/prosody/aliases"
288 custom_alias_secret_file="/etc/prosody/alias_secret"
289
290 Component "alias.xmpp.li"
291 Include "/etc/prosody/alias.xmpp.li.cfg.lua"
292 287
293 Component "proxy.xmpp.li" "proxy65" 288 Component "proxy.xmpp.li" "proxy65"
294 proxy65_acl = {"xmpp.li", "yggdrasil.li", "praseodym.org", "141.li", "nights.email"}; 289 proxy65_acl = {"xmpp.li", "yggdrasil.li", "praseodym.org", "141.li", "nights.email"};
@@ -312,10 +307,8 @@ in rec {
312 ]; 307 ];
313 }; 308 };
314 security.pam.services."xmpp".text = '' 309 security.pam.services."xmpp".text = ''
315 auth requisite pam_succeed_if.so user ingroup xmpp 310 auth requisite pam_succeed_if.so user ingroup xmpp
316 auth [success=1 default=ignore] pam_unix.so sha512 nodelay 311 auth required pam_unix.so audit
317 auth requisite pam_deny.so
318 auth required pam_permit.so
319 ''; 312 '';
320 users.groups."shadow" = { 313 users.groups."shadow" = {
321 members = [ "prosody" 314 members = [ "prosody"