From 49f878b57bf5a22e8deb3112dd0dc2e4b6528179 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 20 Jun 2020 22:08:03 +0200 Subject: xmpp compliance on ymir --- ymir.nix | 20 ++++++++++++++------ 1 file 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 }; myDomains = [ "dirty-haskell.org" "www.dirty-haskell.org" "lists.dirty-haskell.org" "l.dirty-haskell.org" "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" - "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li" + "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li" "upload.xmpp.li" "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" "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" "git.rheperire.org" "api.rheperire.org" "www.rheperire.org" "rheperire.org" @@ -290,17 +290,25 @@ in rec { Component "alias.xmpp.li" Include "/etc/prosody/alias.xmpp.li.cfg.lua" - Component "muc.xmpp.li" "muc" - restrict_room_creation = true - max_history_messages = 100 - name = "Multi-user chats" - Component "proxy.xmpp.li" "proxy65" proxy65_acl = {"xmpp.li", "yggdrasil.li", "praseodym.org", "141.li", "nights.email"}; ''; virtualHosts = builtins.listToAttrs (map (name: { inherit name; value = prosodyVirtHost name; }) ["xmpp.li" "yggdrasil.li" "praseodym.org" "141.li" "nights.email"]); + + uploadHttp = { + domain = "upload.xmpp.li"; + uploadFileSizeLimit = 1024 * 1024 * 1024; + userQuota = 1024 * 1024 * 1024; + }; + + muc = { + domain = "muc.xmpp.li"; + name = "Multi-User Chats"; + restrictRoomCreation = true; + maxHistoryMessages = 250; + }; }; security.pam.services."xmpp".text = '' auth requisite pam_succeed_if.so user ingroup xmpp -- cgit v1.2.3