From 1083ff30c841076ce5e376c5c7c494fa8a9e18fd Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 25 Sep 2015 17:15:01 +0200 Subject: trying prosody with almost no custom config --- ymir.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/ymir.nix b/ymir.nix index 62ad773f..73789294 100644 --- a/ymir.nix +++ b/ymir.nix @@ -80,12 +80,12 @@ in { "gkleen@xmpp.li" ]; allowRegistration = false; - extraConfig = '' - plugin_paths = { "${prosodyModules}" } - authentication = "pam" - ''; - extraModules = [ "auth_pam" - ]; + # extraConfig = '' + # plugin_paths = { "${prosodyModules}" } + # authentication = "pam" + # ''; + # extraModules = [ "auth_pam" + # ]; virtualHosts.default = { enabled = true; @@ -96,12 +96,10 @@ in { }; }; }; - environment.etc."pam.d/xmpp" = { - text = '' - auth [success=1 default=ignore] pam_unix.so obscure sha512 nodelay - auth required pam_succeed_if.so user ingroup xmpp - auth requisite pam_deny.so - auth required pam_permit.so - ''; - }; + security.pam.services."xmpp".text = '' + auth [success=1 default=ignore] pam_unix.so obscure sha512 nodelay + auth required pam_succeed_if.so user ingroup xmpp + auth requisite pam_deny.so + auth required pam_permit.so + ''; } -- cgit v1.2.3