Merge pull request 'Matterbridge media' (#15 ) from matterbridge-media into production

Reviewed-on: #15
dericom02: manage matterbridge media
2023-02-12 00:55:49 +01:00 · 2023-02-12 00:51:59 +01:00 · 2023-02-12 00:51:26 +01:00
2 changed files with 24 additions and 2 deletions
--- 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
--- 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
Author	SHA1	Message	Date
Pratyush Desai	c9a157833b	Merge pull request 'Matterbridge media' (#15 ) from matterbridge-media into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #15	2023-02-12 00:55:49 +01:00
Georg Pfuetzenreuter	1aacd3f340	dericom02: manage matterbridge media All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details - move base media directory to variable - add lighttpd vhosts to pillar Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-02-12 00:51:59 +01:00
Georg Pfuetzenreuter	ab47eb5485	matterbridge: manage media directories Create media directories if defined in the pillar. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-02-12 00:51:26 +01:00