pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Include Slavi's improvements to keep roles independent

Browse source
This commit is contained in:
Aaron Raimist 2019-04-27 17:09:21 -05:00
parent 5586eaddef
commit e42fe4b18c
No known key found for this signature in database
GPG key ID: 37419210002890EF
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
group_vars/matrix-servers
View file

@ -321,6 +321,13 @@ matrix_riot_web_self_check_validate_certificates: "{{ false if matrix_ssl_retrie
matrix_riot_web_registration_enabled: "{{ matrix_synapse_enable_registration }}"
matrix_riot_web_enable_presence_by_hs_url: |
{{
none
if matrix_synapse_use_presence
else {matrix_riot_web_default_hs_url: false}
}}
######################################################################
#
# /matrix-riot-web

3
roles/matrix-riot-web/defaults/main.yml
View file

@ -31,3 +31,6 @@ matrix_riot_web_self_check_validate_certificates: true
# don't show the registration button on welcome page
matrix_riot_web_registration_enabled: false
# Controls whether Riot shows the presence features
matrix_riot_web_enable_presence_by_hs_url: ~

6
roles/matrix-riot-web/templates/config.json.j2
View file

@ -14,10 +14,8 @@
"servers": {{ matrix_riot_web_roomdir_servers|to_json }}
},
"welcomeUserId": {{ matrix_riot_web_welcome_user_id|to_json }},
{% if matrix_synapse_use_presence|to_json %}
"enable_presence_by_hs_url": {
{{ matrix_riot_web_default_hs_url|to_json }}: false
},
{% if matrix_riot_web_enable_presence_by_hs_url is not none %}
"enable_presence_by_hs_url": {{ matrix_riot_web_enable_presence_by_hs_url|to_json }},
{% endif %}
"embeddedPages": {
"homeUrl": {{ matrix_riot_web_embedded_pages_home_url|to_json }}