diff options
| author | Pratyush Desai | 2023-06-24 22:27:51 +0200 |
|---|---|---|
| committer | Pratyush Desai | 2023-06-24 22:27:51 +0200 |
| commit | 937b3c99b7e9f4cab53aefdd34298bf267633c22 (patch) | |
| tree | c29c9b72ec75b12f4cc79f2d3e3e4bcb015fe749 | |
| parent | 36c70f4016c80216d61361fc38fb7c63974e509e (diff) | |
| parent | 667646a295a2ac6194990fcb139e839e0e8e3921 (diff) | |
| download | salt-937b3c99b7e9f4cab53aefdd34298bf267633c22.tar.gz salt-937b3c99b7e9f4cab53aefdd34298bf267633c22.tar.bz2 salt-937b3c99b7e9f4cab53aefdd34298bf267633c22.zip | |
Merge pull request 'Add chillnet matterbridge uploads' (#72) from upload-matterbridge-chillnet into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/72
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
| -rw-r--r-- | pillar/id/dericom02_rigel_lysergic_dev.sls | 2 | ||||
| -rw-r--r-- | pillar/id/deriweb01_rigel_lysergic_dev.sls | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pillar/id/dericom02_rigel_lysergic_dev.sls b/pillar/id/dericom02_rigel_lysergic_dev.sls index b6f9b99..9e9e90e 100644 --- a/pillar/id/dericom02_rigel_lysergic_dev.sls +++ b/pillar/id/dericom02_rigel_lysergic_dev.sls @@ -229,7 +229,7 @@ profile: general: MediaDownloadSize: 1000000000 MediaDownloadPath: {{ mediapath }}chillnet - MediaServerDownload: https://uploads.chillnet.org + MediaServerDownload: https://up.chillnet.org accounts: irc.chillnet: Server: irc.chillnet.org:6697 diff --git a/pillar/id/deriweb01_rigel_lysergic_dev.sls b/pillar/id/deriweb01_rigel_lysergic_dev.sls index 1be2ab9..ed388f5 100644 --- a/pillar/id/deriweb01_rigel_lysergic_dev.sls +++ b/pillar/id/deriweb01_rigel_lysergic_dev.sls @@ -44,11 +44,11 @@ - proxy_set_header: Host $http_host - resolver: '{{ resolver }} ipv4=off valid=24h' {%- endmacro -%} -{%- macro matterbridge_media(domain, name) -%} +{%- macro matterbridge_media(domain, name, tls='load') -%} - server: - include: - snippets/listen - - snippets/tls_load + - snippets/tls_{{ tls }} - snippets/tls - server_name: {{ domain }} - location /: @@ -71,6 +71,7 @@ nginx: {{ nginx_crtkeypair('meet', 'meet.com.de') | indent }} {{ nginx_crtkeypair('takahe', 'social.liberta.casa') | indent }} {{ nginx_crtkeypair('pub_sectigo', 'pub') | indent }} + {{ nginx_crtkeypair('up.chillnet.org', 'up.chillnet.org') | indent }} {#- locations shared between clearnet and Tor LibertaCasa servers #} libertacasa: @@ -316,9 +317,10 @@ nginx: matterbridge.conf: config: - {{ matterbridge_media('load.casa', 'libertacasa-general') }} - {{ matterbridge_media('irc.load.casa', 'libertacasa-irc') }} - {{ matterbridge_media('uploads.chillnet.org', 'chillnet') }} + {{ matterbridge_media('load.casa', 'libertacasa-general') }} + {{ matterbridge_media('irc.load.casa', 'libertacasa-irc') }} + {{ matterbridge_media('up.chillnet.org', 'chillnet', 'up.chillnet.org') }} + meet.conf: config: - server: |