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

Merge pull request 'Add chillnet matterbridge uploads' (#72) from upload-matterbridge-chillnet into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details

Browse Source 
Reviewed-on: #72
Reviewed-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
Pratyush Desai 2023-06-24 22:27:51 +02:00
commit 937b3c99b7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/id/dericom02_rigel_lysergic_dev.sls
View File

@ -229,7 +229,7 @@ profile:
general: general:
MediaDownloadSize: 1000000000 MediaDownloadSize: 1000000000
MediaDownloadPath: {{ mediapath }}chillnet MediaDownloadPath: {{ mediapath }}chillnet
MediaServerDownload: https://uploads.chillnet.org MediaServerDownload: https://up.chillnet.org
accounts: accounts:
irc.chillnet: irc.chillnet:
Server: irc.chillnet.org:6697 Server: irc.chillnet.org:6697

12
pillar/id/deriweb01_rigel_lysergic_dev.sls
View File

@ -44,11 +44,11 @@
- 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(domain, name) -%} {%- macro matterbridge_media(domain, name, tls='load') -%}
- server: - server:
- include: - include:
- snippets/listen - snippets/listen
- snippets/tls_load - snippets/tls_{{ tls }}
- snippets/tls - snippets/tls
- server_name: {{ domain }} - server_name: {{ domain }}
- location /: - location /:
@ -71,6 +71,7 @@ nginx:
{{ nginx_crtkeypair('meet', 'meet.com.de') | indent }} {{ nginx_crtkeypair('meet', 'meet.com.de') | indent }}
{{ nginx_crtkeypair('takahe', 'social.liberta.casa') | indent }} {{ nginx_crtkeypair('takahe', 'social.liberta.casa') | indent }}
{{ nginx_crtkeypair('pub_sectigo', 'pub') | indent }} {{ nginx_crtkeypair('pub_sectigo', 'pub') | indent }}
{{ nginx_crtkeypair('up.chillnet.org', 'up.chillnet.org') | indent }}
{#- locations shared between clearnet and Tor LibertaCasa servers #} {#- locations shared between clearnet and Tor LibertaCasa servers #}
libertacasa: libertacasa:
@ -316,9 +317,10 @@ nginx:
matterbridge.conf: matterbridge.conf:
config: config:
{{ matterbridge_media('load.casa', 'libertacasa-general') }} {{ matterbridge_media('load.casa', 'libertacasa-general') }}
{{ matterbridge_media('irc.load.casa', 'libertacasa-irc') }} {{ matterbridge_media('irc.load.casa', 'libertacasa-irc') }}
{{ matterbridge_media('uploads.chillnet.org', 'chillnet') }} {{ matterbridge_media('up.chillnet.org', 'chillnet', 'up.chillnet.org') }}
meet.conf: meet.conf:
config: config:
- server: - server: