summaryrefslogtreecommitdiffstats
path: root/pillar/id/deriweb01_rigel_lysergic_dev.sls
diff options
context:
space:
mode:
authorPratyush Desai2023-04-10 00:18:59 +0530
committerPratyush Desai2023-04-10 00:18:59 +0530
commit6ebd02042f79d896b57afc865a1fa40ad23e9f2e (patch)
tree21af016ecea753c287ae053608fdf8d5043306d8 /pillar/id/deriweb01_rigel_lysergic_dev.sls
parent84c1cecf614910ea0da86d9ffde349731bda4b30 (diff)
downloadsalt-6ebd02042f79d896b57afc865a1fa40ad23e9f2e.tar.gz
salt-6ebd02042f79d896b57afc865a1fa40ad23e9f2e.tar.bz2
salt-6ebd02042f79d896b57afc865a1fa40ad23e9f2e.zip
Refactor matterbridge_media macro
Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
Diffstat (limited to 'pillar/id/deriweb01_rigel_lysergic_dev.sls')
-rw-r--r--pillar/id/deriweb01_rigel_lysergic_dev.sls11
1 files 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: