Merge branch 'master' into update-homeserver-yaml
This commit is contained in:
commit
e65514223e
@ -140,6 +140,11 @@ matrix_synapse_app_service_config_files: []
|
|||||||
# any password providers have been enabled or not.
|
# any password providers have been enabled or not.
|
||||||
matrix_synapse_password_providers_enabled: false
|
matrix_synapse_password_providers_enabled: false
|
||||||
|
|
||||||
|
# Whether clients can request to include message content in push notifications
|
||||||
|
# sent through third party servers. Setting this to false requires mobile clients
|
||||||
|
# to load message content directly from the homeserver.
|
||||||
|
matrix_synapse_push_include_content: true
|
||||||
|
|
||||||
# Enable exposure of metrics to Prometheus
|
# Enable exposure of metrics to Prometheus
|
||||||
# See https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.rst
|
# See https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.rst
|
||||||
matrix_synapse_metrics_enabled: false
|
matrix_synapse_metrics_enabled: false
|
||||||
|
@ -860,9 +860,9 @@ password_providers:
|
|||||||
# For modern android devices the notification content will still appear
|
# For modern android devices the notification content will still appear
|
||||||
# because it is loaded by the app. iPhone, however will send a
|
# because it is loaded by the app. iPhone, however will send a
|
||||||
# notification saying only that a message arrived and who it came from.
|
# notification saying only that a message arrived and who it came from.
|
||||||
#
|
|
||||||
# push:
|
push:
|
||||||
# include_content: true
|
include_content: {{ matrix_synapse_push_include_content|to_json }}
|
||||||
|
|
||||||
|
|
||||||
# spam_checker:
|
# spam_checker:
|
||||||
|
Loading…
Reference in New Issue
Block a user