summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-04-21 16:53:01 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-04-21 16:53:01 +0200
commit4c25832baf3d8c19770287f27c57fc85c9726f27 (patch)
tree29bf8bf4ea44b049c5b0d4fc12b7cf297310e399
parent4cf3a023aa1f7381c118a6dc671d35a1cdfcf4b2 (diff)
downloadnixos-4c25832baf3d8c19770287f27c57fc85c9726f27.tar
nixos-4c25832baf3d8c19770287f27c57fc85c9726f27.tar.gz
nixos-4c25832baf3d8c19770287f27c57fc85c9726f27.tar.bz2
nixos-4c25832baf3d8c19770287f27c57fc85c9726f27.tar.xz
nixos-4c25832baf3d8c19770287f27c57fc85c9726f27.zip
-rw-r--r--ymir.nix7
1 files changed, 1 insertions, 6 deletions
diff --git a/ymir.nix b/ymir.nix
index 6f879d8e..764d7374 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -270,15 +270,13 @@ in rec {
270 "watchuntrusted" 270 "watchuntrusted"
271 ]; 271 ];
272 extraConfig = '' 272 extraConfig = ''
273 daemonize = false
274
275 reload_modules = { "group", "tls" } 273 reload_modules = { "group", "tls" }
276 authentication="custom" 274 authentication="custom"
277 custom_alias_file="/etc/prosody/aliases" 275 custom_alias_file="/etc/prosody/aliases"
278 custom_alias_secret_file="/etc/prosody/alias_secret" 276 custom_alias_secret_file="/etc/prosody/alias_secret"
279 277
280 log = { 278 log = {
281 { levels = { min = "info" }, to = "console" } 279 { levels = { min = "info" }, to = "*syslog" }
282 } 280 }
283 281
284 Component "alias.xmpp.li" 282 Component "alias.xmpp.li"
@@ -296,9 +294,6 @@ in rec {
296 virtualHosts = builtins.listToAttrs (map (name: { inherit name; value = prosodyVirtHost name; }) 294 virtualHosts = builtins.listToAttrs (map (name: { inherit name; value = prosodyVirtHost name; })
297 ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li" "nights.email"]); 295 ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li" "nights.email"]);
298 }; 296 };
299 systemd.services."prosody".serviceConfig = {
300 Type = lib.mkForce "simple";
301 };
302 security.pam.services."xmpp".text = '' 297 security.pam.services."xmpp".text = ''
303 auth requisite pam_succeed_if.so user ingroup xmpp 298 auth requisite pam_succeed_if.so user ingroup xmpp
304 auth required pam_unix.so audit 299 auth required pam_unix.so audit