diff options
| author | Georg Pfuetzenreuter | 2023-04-09 21:24:24 +0200 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-04-09 21:24:24 +0200 |
| commit | 8420bbdf6f7dcd2a2b9ac3262fe2ffc3282a191f (patch) | |
| tree | 49de551ad9f7e5c5861d235754018ffb0b83f72b /pillar/id/deriweb01_rigel_lysergic_dev.sls | |
| parent | 84c1cecf614910ea0da86d9ffde349731bda4b30 (diff) | |
| parent | 508c0dc1b200db85e9315ca25ec94f722f2db03a (diff) | |
| download | salt-8420bbdf6f7dcd2a2b9ac3262fe2ffc3282a191f.tar.gz salt-8420bbdf6f7dcd2a2b9ac3262fe2ffc3282a191f.tar.bz2 salt-8420bbdf6f7dcd2a2b9ac3262fe2ffc3282a191f.zip | |
Merge pull request 'Add ChillNet matterbridge' (#42) from chillnet into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/42
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Diffstat (limited to 'pillar/id/deriweb01_rigel_lysergic_dev.sls')
| -rw-r--r-- | pillar/id/deriweb01_rigel_lysergic_dev.sls | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pillar/id/deriweb01_rigel_lysergic_dev.sls b/pillar/id/deriweb01_rigel_lysergic_dev.sls index 77b553a..a0ed675 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,9 @@ nginx: matterbridge.conf: config: - {{ matterbridge_media('general') }} - {{ matterbridge_media('irc') }} - + {{ matterbridge_media('load.casa', 'libertacasa-general') }} + {{ matterbridge_media('irc.load.casa', 'libertacasa-irc') }} + {{ matterbridge_media('uploads.chillnet.org', 'chillnet') }} meet.conf: config: - server: |