Merge branch 'master' into update-homeserver-yaml

roles/matrix-synapse/defaults/main.yml

@@ -140,6 +140,11 @@ matrix_synapse_app_service_config_files: []
 # any password providers have been enabled or not.
 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
 # See https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.rst
 matrix_synapse_metrics_enabled: false

roles/matrix-synapse/templates/synapse/homeserver.yaml.j2

@@ -860,9 +860,9 @@ password_providers:
 # For modern android devices the notification content will still appear
 # because it is loaded by the app. iPhone, however will send a
 # notification saying only that a message arrived and who it came from.
-#
-# push:
-#    include_content: true
+
+push:
+   include_content: {{ matrix_synapse_push_include_content|to_json }}
 
 
 # spam_checker: