Pull in homeserver.yaml template updates

This commit is contained in:
Slavi Pantaleev 2018-09-27 10:43:31 +03:00
parent 242f388af3
commit 7350842d9b

View File

@ -74,6 +74,8 @@ pid_file: /homeserver.pid
# different cores. See # different cores. See
# https://www.mirantis.com/blog/improve-performance-python-programs-restricting-single-cpu/. # https://www.mirantis.com/blog/improve-performance-python-programs-restricting-single-cpu/.
# #
# This setting requires the affinity package to be installed!
#
# cpu_affinity: 0xFFFFFFFF # cpu_affinity: 0xFFFFFFFF
# Whether to serve a web client from the HTTP/HTTPS root resource. # Whether to serve a web client from the HTTP/HTTPS root resource.
@ -93,6 +95,9 @@ public_baseurl: https://{{ hostname_matrix }}/
# hard limit. # hard limit.
soft_file_limit: 0 soft_file_limit: 0
# Set to false to disable presence tracking on this homeserver.
use_presence: true
# The GC threshold parameters to pass to `gc.set_threshold`, if defined # The GC threshold parameters to pass to `gc.set_threshold`, if defined
# gc_thresholds: [700, 10, 10] # gc_thresholds: [700, 10, 10]
@ -173,6 +178,33 @@ listeners:
# type: manhole # type: manhole
# Homeserver blocking
#
# How to reach the server admin, used in ResourceLimitError
# admin_contact: 'mailto:admin@server.com'
#
# Global block config
#
# hs_disabled: False
# hs_disabled_message: 'Human readable reason for why the HS is blocked'
# hs_disabled_limit_type: 'error code(str), to help clients decode reason'
#
# Monthly Active User Blocking
#
# Enables monthly active user checking
# limit_usage_by_mau: False
# max_mau_value: 50
# mau_trial_days: 2
#
# Sometimes the server admin will want to ensure certain accounts are
# never blocked by mau checking. These accounts are specified here.
#
# mau_limit_reserved_threepids:
# - medium: 'email'
# address: 'reserved_user@example.com'
# Database configuration # Database configuration
database: database:
# The database engine name # The database engine name
@ -649,6 +681,9 @@ enable_group_creation: false
# User Consent configuration # User Consent configuration
# #
# for detailed instructions, see
# https://github.com/matrix-org/synapse/blob/master/docs/consent_tracking.md
#
# Parts of this section are required if enabling the 'consent' resource under # Parts of this section are required if enabling the 'consent' resource under
# 'listeners', in particular 'template_dir' and 'version'. # 'listeners', in particular 'template_dir' and 'version'.
# #