pillar/id/dericom02_rigel_lysergic_dev.sls

@@ -1,5 +1,3 @@
-{%- set mediapath = '/srv/matterbridge/' -%}
-
 {%- macro discord_common() -%}
             AutoWebhooks: true
             EditSuffix: '(edited)'
@@ -12,7 +10,7 @@ profile:
       libertacasa-general:
         general:
           MediaDownloadSize: 1000000000
-          MediaDownloadPath: {{ mediapath }}libertacasa-general
+          MediaDownloadPath: /srv/matterbridge/libertacasa-general/media
           MediaServerDownload: https://load.casa
         accounts:
           irc.libertacasa:
@@ -90,7 +88,7 @@ profile:
           IgnoreFailureOnStart: true
           MessageSplit: true
           MediaDownloadSize: 1000000000
-          MediaDownloadPath: {{ mediapath }}libertacasa-irc
+          MediaDownloadPath: /srv/matterbridge/libertacasa-irc/media
           MediaServerDownload: https://irc.load.casa
         accounts:
           irc.libertacasa:
@@ -221,12 +219,3 @@ 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

salt/profile/matterbridge/init.sls

@@ -37,17 +37,6 @@ 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