summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ymir.nix20
1 files changed, 14 insertions, 6 deletions
diff --git a/ymir.nix b/ymir.nix
index 79f5c02c..0c28cae1 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -20,7 +20,7 @@ let
20 }; 20 };
21 myDomains = [ "dirty-haskell.org" "www.dirty-haskell.org" "lists.dirty-haskell.org" "l.dirty-haskell.org" 21 myDomains = [ "dirty-haskell.org" "www.dirty-haskell.org" "lists.dirty-haskell.org" "l.dirty-haskell.org"
22 "online.141.li" "o.141.li" "ftp.141.li" "files.141.li" "f.141.li" "ymir.141.li" "141.li" "www.141.li" "lists.141.li" "l.141.li" "rpg.141.li" "odin.141.li" 22 "online.141.li" "o.141.li" "ftp.141.li" "files.141.li" "f.141.li" "ymir.141.li" "141.li" "www.141.li" "lists.141.li" "l.141.li" "rpg.141.li" "odin.141.li"
23 "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li" 23 "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li" "upload.xmpp.li"
24 "online.yggdrasil.li" "o.yggdrasil.li" "ftp.yggdrasil.li" "files.yggdrasil.li" "f.yggdrasil.li" "ymir.yggdrasil.li" "git.yggdrasil.li" "www.yggdrasil.li" "yggdrasil.li" "lists.yggdrasil.li" "l.yggdrasil.li" "rpg.yggdrasil.li" "odin.yggdrasil.li" 24 "online.yggdrasil.li" "o.yggdrasil.li" "ftp.yggdrasil.li" "files.yggdrasil.li" "f.yggdrasil.li" "ymir.yggdrasil.li" "git.yggdrasil.li" "www.yggdrasil.li" "yggdrasil.li" "lists.yggdrasil.li" "l.yggdrasil.li" "rpg.yggdrasil.li" "odin.yggdrasil.li"
25 "online.praseodym.org" "o.praseodym.org" "ftp.praseodym.org" "files.praseodym.org" "f.praseodym.org" "ymir.praseodym.org" "praseodym.org" "www.praseodym.org" "lists.praseodym.org" "l.praseodym.org" "rpg.praseodym.org" 25 "online.praseodym.org" "o.praseodym.org" "ftp.praseodym.org" "files.praseodym.org" "f.praseodym.org" "ymir.praseodym.org" "praseodym.org" "www.praseodym.org" "lists.praseodym.org" "l.praseodym.org" "rpg.praseodym.org"
26 "git.rheperire.org" "api.rheperire.org" "www.rheperire.org" "rheperire.org" 26 "git.rheperire.org" "api.rheperire.org" "www.rheperire.org" "rheperire.org"
@@ -290,17 +290,25 @@ in rec {
290 Component "alias.xmpp.li" 290 Component "alias.xmpp.li"
291 Include "/etc/prosody/alias.xmpp.li.cfg.lua" 291 Include "/etc/prosody/alias.xmpp.li.cfg.lua"
292 292
293 Component "muc.xmpp.li" "muc"
294 restrict_room_creation = true
295 max_history_messages = 100
296 name = "Multi-user chats"
297
298 Component "proxy.xmpp.li" "proxy65" 293 Component "proxy.xmpp.li" "proxy65"
299 proxy65_acl = {"xmpp.li", "yggdrasil.li", "praseodym.org", "141.li", "nights.email"}; 294 proxy65_acl = {"xmpp.li", "yggdrasil.li", "praseodym.org", "141.li", "nights.email"};
300 ''; 295 '';
301 296
302 virtualHosts = builtins.listToAttrs (map (name: { inherit name; value = prosodyVirtHost name; }) 297 virtualHosts = builtins.listToAttrs (map (name: { inherit name; value = prosodyVirtHost name; })
303 ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li" "nights.email"]); 298 ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li" "nights.email"]);
299
300 uploadHttp = {
301 domain = "upload.xmpp.li";
302 uploadFileSizeLimit = 1024 * 1024 * 1024;
303 userQuota = 1024 * 1024 * 1024;
304 };
305
306 muc = {
307 domain = "muc.xmpp.li";
308 name = "Multi-User Chats";
309 restrictRoomCreation = true;
310 maxHistoryMessages = 250;
311 };
304 }; 312 };
305 security.pam.services."xmpp".text = '' 313 security.pam.services."xmpp".text = ''
306 auth requisite pam_succeed_if.so user ingroup xmpp 314 auth requisite pam_succeed_if.so user ingroup xmpp