From ab47eb5485ebab42a4129eacafd6ea96c1dbe512 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Sun, 12 Feb 2023 00:51:26 +0100
Subject: [PATCH 1/2] matterbridge: manage media directories

Create media directories if defined in the pillar.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 salt/profile/matterbridge/init.sls | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/salt/profile/matterbridge/init.sls b/salt/profile/matterbridge/init.sls
index 1e0cd51..a68de46 100644
--- a/salt/profile/matterbridge/init.sls
+++ b/salt/profile/matterbridge/init.sls
@@ -37,6 +37,17 @@ matterbridge_files:
 {%- endfor %}
 
 {%- for instance in instances %}
+{%- if 'general' in instances[instance] and 'MediaDownloadPath' in instances[instance]['general'] %}
+matterbridge_{{ instance }}_mediadir:
+  file.directory:
+    - name: {{ instances[instance]['general']['MediaDownloadPath'] }}
+    - user: matterbridge
+    {#- to-do: implement some shared group #}
+    - group: lighttpd
+    - mode: 750
+    - makedirs: True
+{%- endif %}
+
 matterbridge_{{ instance }}_service:
   service.running:
     - name: matterbridge@{{ instance }}.service
-- 
2.35.3


From 1aacd3f3403cb8643204a7ea235ea40f7de56de5 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Sun, 12 Feb 2023 00:51:59 +0100
Subject: [PATCH 2/2] dericom02: manage matterbridge media

- move base media directory to variable
- add lighttpd vhosts to pillar

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 pillar/id/dericom02_rigel_lysergic_dev.sls | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pillar/id/dericom02_rigel_lysergic_dev.sls b/pillar/id/dericom02_rigel_lysergic_dev.sls
index 16792f1..61dcbc4 100644
--- a/pillar/id/dericom02_rigel_lysergic_dev.sls
+++ b/pillar/id/dericom02_rigel_lysergic_dev.sls
@@ -1,3 +1,5 @@
+{%- set mediapath = '/srv/matterbridge/' -%}
+
 {%- macro discord_common() -%}
             AutoWebhooks: true
             EditSuffix: '(edited)'
@@ -10,7 +12,7 @@ profile:
       libertacasa-general:
         general:
           MediaDownloadSize: 1000000000
-          MediaDownloadPath: /srv/matterbridge/libertacasa-general/media
+          MediaDownloadPath: {{ mediapath }}libertacasa-general
           MediaServerDownload: https://load.casa
         accounts:
           irc.libertacasa:
@@ -88,7 +90,7 @@ profile:
           IgnoreFailureOnStart: true
           MessageSplit: true
           MediaDownloadSize: 1000000000
-          MediaDownloadPath: /srv/matterbridge/libertacasa-irc/media
+          MediaDownloadPath: {{ mediapath }}libertacasa-irc
           MediaServerDownload: https://irc.load.casa
         accounts:
           irc.libertacasa:
@@ -219,3 +221,12 @@ profile:
             irc.libertacasa: '#music'
             irc.chillnet: '#music'
             irc.stardust: '#music'
+
+  lighttpd:
+    vhosts:
+      matterbridge-general:
+        host: 'libertacasa-general\.matterbridge\.dericom02\.rigel\.lysergic\.dev'
+        root: {{ mediapath }}libertacasa-general
+      matterbridge-irc:
+        host: 'libertacasa-irc\.matterbridge\.dericom02\.rigel\.lysergic\.dev'
+        root: {{ mediapath }}libertacasa-irc
-- 
2.35.3