From 6ebd02042f79d896b57afc865a1fa40ad23e9f2e Mon Sep 17 00:00:00 2001
From: Pratyush Desai <pratyush.desai@liberta.casa>
Date: Mon, 10 Apr 2023 00:18:59 +0530
Subject: [PATCH 1/2] Refactor matterbridge_media macro

Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
---
 pillar/id/deriweb01_rigel_lysergic_dev.sls | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pillar/id/deriweb01_rigel_lysergic_dev.sls b/pillar/id/deriweb01_rigel_lysergic_dev.sls
index 77b553a..1bdc63b 100644
--- a/pillar/id/deriweb01_rigel_lysergic_dev.sls
+++ b/pillar/id/deriweb01_rigel_lysergic_dev.sls
@@ -44,15 +44,15 @@
                 - proxy_set_header: Host $http_host
                 - resolver: '{{ resolver }} ipv4=off valid=24h'
 {%- endmacro -%}
-{%- macro matterbridge_media(name) -%}
+{%- macro matterbridge_media(domain, name) -%}
           - server:
             - include:
               - snippets/listen
               - snippets/tls_load
               - snippets/tls
-            - server_name: {% if name == 'general' %}load.casa{%- else %}{{ name ~ '.load.casa' }}{%- endif %}
+            - server_name: {{ domain }}
             - location /:
-                - proxy_pass: http://libertacasa-{{ name }}.matterbridge.dericom02.rigel.lysergic.dev
+                - proxy_pass: http://{{ name }}.matterbridge.dericom02.rigel.lysergic.dev
 {%- endmacro -%}
 
 nginx:
@@ -316,9 +316,8 @@ nginx:
 
       matterbridge.conf:
         config:
-          {{  matterbridge_media('general') }}
-          {{  matterbridge_media('irc') }}
-
+          {{  matterbridge_media('load.casa', 'libertacasa-general') }}
+          {{  matterbridge_media('irc.load.casa', 'libertacasa-irc') }}
       meet.conf:
         config:
           - server:

From 508c0dc1b200db85e9315ca25ec94f722f2db03a Mon Sep 17 00:00:00 2001
From: Pratyush Desai <pratyush.desai@liberta.casa>
Date: Mon, 10 Apr 2023 00:25:14 +0530
Subject: [PATCH 2/2] Add Chillnet to matterbridge

Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
---
 pillar/id/dericom02_rigel_lysergic_dev.sls | 33 ++++++++++++++++++++++
 pillar/id/deriweb01_rigel_lysergic_dev.sls |  1 +
 2 files changed, 34 insertions(+)

diff --git a/pillar/id/dericom02_rigel_lysergic_dev.sls b/pillar/id/dericom02_rigel_lysergic_dev.sls
index 51a487e..63ec985 100644
--- a/pillar/id/dericom02_rigel_lysergic_dev.sls
+++ b/pillar/id/dericom02_rigel_lysergic_dev.sls
@@ -224,6 +224,36 @@ profile:
             irc.chillnet: '#music'
             irc.stardust: '#music'
 
+      chillnet:
+        general:
+          MediaDownloadSize: 1000000000
+          MediaDownloadPath: {{ mediapath }}chillnet
+          MediaServerDownload: https://uploads.chillnet.org
+        accounts:
+          irc.chillnet:
+            Server: irc.chillnet.org:6697
+            UseTLS: 'true'
+            UseSASL: 'true'
+            Nick: viaduct
+            NickServNick: viaduct
+            NickServPassword: ${'secret_matterbridge:chillnet:accounts:irc.chillnet:NickServPassword'}
+            ColorNicks: 'true'
+            Charset: utf8
+            MessageSplit: 'true'
+            MessageQueue: 60
+            UseRelayMsg: 'true'
+            RemoteNickFormat: '{NICK}/{LABEL}'
+          telegram.chillnet:
+            Token: ${'secret_matterbridge:chillnet:accounts:telegram.chillnet:Token'}
+            RemoteNickFormat: '&lt;{NICK}&gt; '
+            MessageFormat: HTMLNick
+            Label: tg
+            DisableWebPagePreview: 'true'
+        gateways:
+          fightclub:
+            irc.chillnet: '#fightclub'
+            telegram.chillnet: '-1001932699309'
+
   lighttpd:
     vhosts:
       matterbridge-general:
@@ -232,6 +262,9 @@ profile:
       matterbridge-irc:
         host: 'libertacasa-irc\.matterbridge\.dericom02\.rigel\.lysergic\.dev'
         root: {{ mediapath }}libertacasa-irc
+      matterbridge-chillnet:
+        host: 'chillnet\.matterbridge\.dericom02\.rigel\.lysergic\.dev'
+        root: {{ mediapath }}chill
 
 firewalld:
   zones:
diff --git a/pillar/id/deriweb01_rigel_lysergic_dev.sls b/pillar/id/deriweb01_rigel_lysergic_dev.sls
index 1bdc63b..a0ed675 100644
--- a/pillar/id/deriweb01_rigel_lysergic_dev.sls
+++ b/pillar/id/deriweb01_rigel_lysergic_dev.sls
@@ -318,6 +318,7 @@ nginx:
         config:
           {{  matterbridge_media('load.casa', 'libertacasa-general') }}
           {{  matterbridge_media('irc.load.casa', 'libertacasa-irc') }}
+          {{  matterbridge_media('uploads.chillnet.org', 'chillnet') }}
       meet.conf:
         config:
           - server: