From 6574a3ce8407a7d0ff66613baf2545e768549e09 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 23 Mar 2017 15:17:32 +0100
Subject: Disco and socks proxy

---
 ymir.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ymir.nix b/ymir.nix
index a3f6ff29..39d6641f 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -15,7 +15,7 @@ let
   };
   myDomains = ["dirty-haskell.org" "www.dirty-haskell.org" "lists.dirty-haskell.org" "l.dirty-haskell.org"
                "files.141.li" "f.141.li" "ymir.141.li" "141.li" "www.141.li" "lists.141.li" "l.141.li" "bragi.141.li"
-               "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li"
+               "ymir.xmpp.li" "xmpp.li" "www.xmpp.li" "lists.xmpp.li" "l.xmpp.li" "muc.xmpp.li" "proxy.xmpp.li"
                "files.yggdrasil.li" "f.yggdrasil.li" "ymir.yggdrasil.li" "git.yggdrasil.li" "www.yggdrasil.li" "yggdrasil.li" "lists.yggdrasil.li" "l.yggdrasil.li" "bragi.yggdrasil.li"
                "files.praseodym.org" "f.praseodym.org" "ymir.praseodym.org" "praseodym.org" "www.praseodym.org" "lists.praseodym.org" "l.praseodym.org"
                "ymir.kleen.li" "kleen.li" "www.kleen.li"
@@ -229,6 +229,7 @@ in rec {
                      "csi_pump"
                      "cloud_notify"
                      "pep"
+                     "disco"
                    ];
     extraConfig = ''
       reload_modules = { "group", "tls" }
@@ -243,6 +244,9 @@ in rec {
         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; })
-- 
cgit v1.2.3