From b8f45d29b1bf4781f7a4e364c8d26a0864cf62bc Mon Sep 17 00:00:00 2001
From: Pratyush Desai <pratyush.desai@liberta.casa>
Date: Sun, 25 Jun 2023 01:32:42 +0530
Subject: [PATCH] Add chillnet matterbridge uploads

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

diff --git a/pillar/id/dericom02_rigel_lysergic_dev.sls b/pillar/id/dericom02_rigel_lysergic_dev.sls
index b6f9b99..9e9e90e 100644
--- a/pillar/id/dericom02_rigel_lysergic_dev.sls
+++ b/pillar/id/dericom02_rigel_lysergic_dev.sls
@@ -229,7 +229,7 @@ profile:
         general:
           MediaDownloadSize: 1000000000
           MediaDownloadPath: {{ mediapath }}chillnet
-          MediaServerDownload: https://uploads.chillnet.org
+          MediaServerDownload: https://up.chillnet.org
         accounts:
           irc.chillnet:
             Server: irc.chillnet.org:6697
diff --git a/pillar/id/deriweb01_rigel_lysergic_dev.sls b/pillar/id/deriweb01_rigel_lysergic_dev.sls
index 1be2ab9..1d4765c 100644
--- a/pillar/id/deriweb01_rigel_lysergic_dev.sls
+++ b/pillar/id/deriweb01_rigel_lysergic_dev.sls
@@ -44,11 +44,11 @@
                 - proxy_set_header: Host $http_host
                 - resolver: '{{ resolver }} ipv4=off valid=24h'
 {%- endmacro -%}
-{%- macro matterbridge_media(domain, name) -%}
+{%- macro matterbridge_media(domain, name, tls='load') -%}
           - server:
             - include:
               - snippets/listen
-              - snippets/tls_load
+              - snippets/tls_{{ tls }}
               - snippets/tls
             - server_name: {{ domain }}
             - location /:
@@ -71,6 +71,7 @@ nginx:
     {{ nginx_crtkeypair('meet', 'meet.com.de') | indent }}
     {{ nginx_crtkeypair('takahe', 'social.liberta.casa') | indent }}
     {{ nginx_crtkeypair('pub_sectigo', 'pub') | indent }}
+    {{nginx_crtkeypair('up.chillnet.org', 'up.chillnet.org') | indent}}
 
     {#- locations shared between clearnet and Tor LibertaCasa servers #}
     libertacasa:
@@ -318,7 +319,8 @@ nginx:
         config:
           {{  matterbridge_media('load.casa', 'libertacasa-general') }}
           {{  matterbridge_media('irc.load.casa', 'libertacasa-irc') }}
-          {{  matterbridge_media('uploads.chillnet.org', 'chillnet') }}
+          {{  matterbridge_media('up.chillnet.org', 'chillnet', 'up.chillnet.org') }}
+
       meet.conf:
         config:
           - server: