Merge pull request #147 from aaronraimist/enable_presence_by_hs_url

Set Riot's enable_presence_by_hs_url to false if presence is disabled
This commit is contained in:
Slavi Pantaleev 2019-04-28 08:44:22 +03:00 committed by GitHub
commit 8a862e2414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions

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_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 # /matrix-riot-web

View File

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

View File

@ -14,6 +14,9 @@
"servers": {{ matrix_riot_web_roomdir_servers|to_json }} "servers": {{ matrix_riot_web_roomdir_servers|to_json }}
}, },
"welcomeUserId": {{ matrix_riot_web_welcome_user_id|to_json }}, "welcomeUserId": {{ matrix_riot_web_welcome_user_id|to_json }},
{% 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": { "embeddedPages": {
"homeUrl": {{ matrix_riot_web_embedded_pages_home_url|to_json }} "homeUrl": {{ matrix_riot_web_embedded_pages_home_url|to_json }}
} }