LibertaCasa/salt
LibertaCasa/salt
9
1
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add ChillNet matterbridge #42

Merged
Georg merged 2 commits from chillnet into production 2023-04-09 21:24:25 +02:00
Conversation 0 Commits 2 Files Changed 2 +5 -6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ebd02042f - Show all commits

11
pillar/id/deriweb01_rigel_lysergic_dev.sls
View File

@ -44,15 +44,15 @@
- proxy_set_header: Host $http_host - proxy_set_header: Host $http_host
- resolver: '{{ resolver }} ipv4=off valid=24h' - resolver: '{{ resolver }} ipv4=off valid=24h'
{%- endmacro -%} {%- endmacro -%}
{%- macro matterbridge_media(name) -%} {%- macro matterbridge_media(domain, name) -%}
- server: - server:
- include: - include:
- snippets/listen - snippets/listen
- snippets/tls_load - snippets/tls_load
- snippets/tls - snippets/tls
- server_name: {% if name == 'general' %}load.casa{%- else %}{{ name ~ '.load.casa' }}{%- endif %} - server_name: {{ domain }}
- location /: - location /:
- proxy_pass: http://libertacasa-{{ name }}.matterbridge.dericom02.rigel.lysergic.dev - proxy_pass: http://{{ name }}.matterbridge.dericom02.rigel.lysergic.dev
{%- endmacro -%} {%- endmacro -%}
nginx: nginx:
@ -316,9 +316,8 @@ nginx:
matterbridge.conf: matterbridge.conf:
config: config:
{{ matterbridge_media('general') }} {{ matterbridge_media('load.casa', 'libertacasa-general') }}
{{ matterbridge_media('irc') }} {{ matterbridge_media('irc.load.casa', 'libertacasa-irc') }}
Georg commented 2023-04-09 21:23:05 +02:00
Review
Copy Link

Could have left the empty line before meet.conf, but it’s no problem. ;-)

Could have left the empty line before `meet.conf`, but it's no problem. ;-)
meet.conf: meet.conf:
config: config:
- server: - server: