Merge branch 'master' into bye-bye-nginx-proxy

This commit is contained in:
Slavi Pantaleev
2024-01-09 16:03:01 +02:00
3 changed files with 11 additions and 2 deletions

View File

@ -3212,6 +3212,7 @@ matrix_ma1sd_database_password: "{{ '%s' | format(matrix_homeserver_generic_secr
######################################################################
matrix_media_repo_enabled: false
matrix_media_repo_container_network: "{{ matrix_nginx_proxy_container_network if matrix_playbook_reverse_proxy_type == 'playbook-managed-nginx' else matrix_media_repo_identifier }}"
matrix_media_repo_container_additional_networks: |