finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Wire matrix_container_images_self_build to self_build variables via group_vars/matrix_servers

Browse Source 
This keeps the roles cleaner and more independent of matrix-base,
which may be important for people building their own playbook
out of the individual roles and not using the matrix-base role.
This commit is contained in:
Slavi Pantaleev
2020-03-15 10:10:41 +02:00
parent 447dd94ff9
commit 8fe97abe7d
7 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
group_vars/matrix_servers
View File

@ -172,6 +172,8 @@ matrix_appservice_irc_homeserver_token: "{{ matrix_synapse_macaroon_secret_key |
# We don't enable bridges by default.
matrix_mautrix_facebook_enabled: false
matrix_mautrix_facebook_self_build: "{{ matrix_container_images_self_build }}"
matrix_mautrix_facebook_systemd_required_services_list: |
{{
['docker.service']
@ -201,6 +203,8 @@ matrix_mautrix_facebook_login_shared_secret: "{{ matrix_synapse_ext_password_pro
# We don't enable bridges by default.
matrix_mautrix_hangouts_enabled: false
matrix_mautrix_hangouts_self_build: "{{ matrix_container_images_self_build }}"
matrix_mautrix_hangouts_systemd_required_services_list: |
{{
['docker.service']
@ -329,6 +333,8 @@ matrix_corporal_matrix_registration_shared_secret: "{{ matrix_synapse_registrati
matrix_coturn_enabled: true
matrix_coturn_self_build: "{{ matrix_container_images_self_build }}"
matrix_coturn_turn_external_ip_address: "{{ ansible_host }}"
matrix_coturn_tls_enabled: true
@ -415,6 +421,8 @@ matrix_mailer_enabled: true
# If you wish to use the public identity servers (matrix.org, vector.im) instead of your own you may wish to disable this.
matrix_mxisd_enabled: true
matrix_mxisd_self_build: "{{ matrix_container_images_self_build }}"
# Normally, matrix-nginx-proxy is enabled and nginx can reach mxisd over the container network.
# If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
# mxisd's web-server port.
@ -559,6 +567,8 @@ matrix_postgres_db_name: "homeserver"
# If you wish to connect to your Matrix server by other means, you may wish to disable this.
matrix_riot_web_enabled: true
matrix_riot_web_self_build: "{{ matrix_container_images_self_build }}"
# Normally, matrix-nginx-proxy is enabled and nginx can reach riot-web over the container network.
# If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
# the riot-web HTTP port to the local host.
@ -600,6 +610,8 @@ matrix_riot_web_welcome_user_id: ~
#
######################################################################
matrix_synapse_self_build: "{{ matrix_container_images_self_build }}"
# When mxisd is enabled, we can use it instead of the default public Identity servers.
matrix_synapse_trusted_third_party_id_servers: "{{ [matrix_server_fqn_matrix] if matrix_mxisd_enabled else matrix_synapse_id_servers_public }}"