update config's

2025-02-04 09:15:31 -05:00 · 2022-09-13 14:01:03 +02:00 · 2022-09-13 14:01:03 +02:00 · 39fd18bfc9
commit 39fd18bfc9
parent f26fa0b768
7 changed files with 149 additions and 64 deletions
--- a/etc/matrix-synapse/homeserver.yaml
+++ b/etc/matrix-synapse/homeserver.yaml
@ -59,7 +59,7 @@ modules:
      # these rooms.
      ban_lists:
        # EBL
-        - "!UyrSHIwWgbGsHjabGe:envs.net"
+        - "!GGuqmQVLNyWASNjVQw:envs.net"
        # matrix-coc-bl
        - "!WuBtumawCeOGEieRrp:matrix.org"
        # matrix-tos-bl
@ -68,6 +68,8 @@ modules:
        - "!RRGtWzzVKUJmDVRNnZ:aria-net.org"
        # asragr-ban-list
        - "!YImXsibeOfGBYVaElT:asra.gr"
+        # community-moderation-effort-bl:neko.dev
+        - "!fTjMjIzNKEsFlUIiru:neko.dev"
      #message_max_length:
         # Limit the characters in a message (event body) that a client can send in an event on this server.
         # By default there is no limit (beyond the the limit the spec enforces on event size).
@ -627,7 +629,7 @@ retention:
  # The message retention policies feature is disabled by default. Uncomment the
  # following line to enable it.
  #
-  enabled: true
+  enabled: false

  # Default retention policy. If set, Synapse will apply it to rooms that lack the
  # 'm.room.retention' state event. Currently, the value of 'min_lifetime' doesn't
@ -814,7 +816,7 @@ retention:
 # The number of events to cache in memory. Not affected by
 # caches.global_factor.
 #
-#event_cache_size: 10K
+#event_cache_size: 15K

 caches:
  # Controls the global cache factor, which is the default cache factor
@ -1453,31 +1455,6 @@ allow_guest_access: false
 #
 #default_identity_server: https://matrix.org

-# Handle threepid (email/phone etc) registration and password resets through a set of
-# *trusted* identity servers. Note that this allows the configured identity server to
-# reset passwords for accounts!
-#
-# Be aware that if `email` is not set, and SMTP options have not been
-# configured in the email config block, registration and user password resets via
-# email will be globally disabled.
-#
-# Additionally, if `msisdn` is not set, registration and password resets via msisdn
-# will be disabled regardless, and users will not be able to associate an msisdn
-# identifier to their account. This is due to Synapse currently not supporting
-# any method of sending SMS messages on its own.
-#
-# To enable using an identity server for operations regarding a particular third-party
-# identifier type, set the value to the URL of that identity server as shown in the
-# examples below.
-#
-# Servers handling the these requests must answer the `/requestToken` endpoints defined
-# by the Matrix Identity Service API specification:
-# https://matrix.org/docs/spec/identity_service/latest
-#
-account_threepid_delegates:
-    #email: https://example.com     # Delegate email sending to example.com
-    #msisdn: http://localhost:8090  # Delegate SMS sending to this local process
-
 # Whether users are allowed to change their displayname after it has
 # been initially set. Useful when provisioning users based on the
 # contents of a third-party directory.
@ -2374,6 +2351,8 @@ email:
  # smtp_user: "exampleusername"
  # smtp_pass: "examplepassword"

+  #force_tls: true
+
  # Uncomment the following to require TLS transport security for SMTP.
  # By default, Synapse will connect over plain text, and will then switch to
  # TLS via STARTTLS *if the SMTP server supports it*. If this option is set,
@ -2965,4 +2944,5 @@ background_updates:


 experimental_features:
+  msc2815_enabled: true
  msc2285_enabled: true
--- a/etc/matrix-synapse/workers/generic_worker1.yaml
+++ b/etc/matrix-synapse/workers/generic_worker1.yaml
@ -5,6 +5,8 @@ worker_name: generic_worker1
 worker_replication_host: 127.0.0.1
 worker_replication_http_port: 9093

+worker_main_http_uri: http://localhost:8008/
+
 worker_log_config: /etc/matrix-synapse/workers/generic_worker1_log_config.yaml

 worker_listeners:
--- a/etc/matrix-synapse/workers/generic_worker2.yaml
+++ b/etc/matrix-synapse/workers/generic_worker2.yaml
@ -5,6 +5,8 @@ worker_name: generic_worker2
 worker_replication_host: 127.0.0.1
 worker_replication_http_port: 9093

+worker_main_http_uri: http://localhost:8008/
+
 worker_log_config: /etc/matrix-synapse/workers/generic_worker2_log_config.yaml

 worker_listeners:
--- a/etc/matrix-synapse/workers/generic_worker3.yaml
+++ b/etc/matrix-synapse/workers/generic_worker3.yaml
@ -5,6 +5,8 @@ worker_name: generic_worker3
 worker_replication_host: 127.0.0.1
 worker_replication_http_port: 9093

+worker_main_http_uri: http://localhost:8008/
+
 worker_log_config: /etc/matrix-synapse/workers/generic_worker3_log_config.yaml

 worker_listeners:
--- a/etc/matrix-synapse/workers/generic_worker4.yaml
+++ b/etc/matrix-synapse/workers/generic_worker4.yaml
@ -5,6 +5,8 @@ worker_name: generic_worker4
 worker_replication_host: 127.0.0.1
 worker_replication_http_port: 9093

+worker_main_http_uri: http://localhost:8008/
+
 worker_log_config: /etc/matrix-synapse/workers/generic_worker4_log_config.yaml

 worker_listeners:
--- a/etc/nginx/include.d/generic_worker.conf
+++ b/etc/nginx/include.d/generic_worker.conf
@ -230,6 +230,12 @@ location ~ ^/_matrix/client/(r0|v3|unstable)/room_keys/ {
 	proxy_pass http://generic_worker_lc;
 }

+# Note that ^/_matrix/client/(r0|v3|unstable)/keys/upload/ requires `worker_main_http_uri`
+location ~ ^/_matrix/client/(r0|v3|unstable)/keys/upload/ {
+	include include.d/synapse-proxy.conf;
+	proxy_pass http://generic_worker_lc;
+}
+

 ## Registration/login requests
 location ~ ^/_matrix/client/(api/v1|r0|v3|unstable)/login$ {
--- a/etc/postgresql/13/main/postgresql.conf
+++ b/etc/postgresql/13/main/postgresql.conf
@ -38,15 +38,15 @@
 # The default values of these variables are driven from the -D command-line
 # option or PGDATA environment variable, represented here as ConfigDir.

-data_directory = '/var/lib/postgresql/11/main'		# use data in another directory
+data_directory = '/var/lib/postgresql/13/main'		# use data in another directory
 					# (change requires restart)
-hba_file = '/etc/postgresql/11/main/pg_hba.conf'	# host-based authentication file
+hba_file = '/etc/postgresql/13/main/pg_hba.conf'	# host-based authentication file
 					# (change requires restart)
-ident_file = '/etc/postgresql/11/main/pg_ident.conf'	# ident configuration file
+ident_file = '/etc/postgresql/13/main/pg_ident.conf'	# ident configuration file
 					# (change requires restart)

 # If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '/var/run/postgresql/11-main.pid'			# write an extra PID file
+external_pid_file = '/var/run/postgresql/13-main.pid'			# write an extra PID file
 					# (change requires restart)


@ -56,7 +56,7 @@ external_pid_file = '/var/run/postgresql/11-main.pid'			# write an extra PID fil

 # - Connection Settings -

-listen_addresses = '127.0.0.1'		# what IP address(es) to listen on;
+#listen_addresses = 'localhost'		# what IP address(es) to listen on;
 					# comma-separated list of addresses;
 					# defaults to 'localhost'; use '*' for all
 					# (change requires restart)
@ -73,8 +73,8 @@ unix_socket_directories = '/var/run/postgresql'	# comma-separated list of direct
 #bonjour_name = ''			# defaults to the computer name
 					# (change requires restart)

-# - TCP Keepalives -
-# see "man 7 tcp" for details
+# - TCP settings -
+# see "man tcp" for details

 #tcp_keepalives_idle = 0		# TCP_KEEPIDLE, in seconds;
 					# 0 selects the system default
@ -82,15 +82,17 @@ unix_socket_directories = '/var/run/postgresql'	# comma-separated list of direct
 					# 0 selects the system default
 #tcp_keepalives_count = 0		# TCP_KEEPCNT;
 					# 0 selects the system default
+#tcp_user_timeout = 0			# TCP_USER_TIMEOUT, in milliseconds;
+					# 0 selects the system default

 # - Authentication -

 #authentication_timeout = 1min		# 1s-600s
-password_encryption = 'scram-sha-256'	# md5 or scram-sha-256
+password_encryption = scram-sha-256		# md5 or scram-sha-256
 #db_user_namespace = off

 # GSSAPI using Kerberos
-#krb_server_keyfile = ''
+#krb_server_keyfile = 'FILE:${sysconfdir}/krb5.keytab'
 #krb_caseins_users = off

 # - SSL -
@ -103,6 +105,8 @@ ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'
 #ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
 #ssl_prefer_server_ciphers = on
 #ssl_ecdh_curve = 'prime256v1'
+#ssl_min_protocol_version = 'TLSv1.2'
+#ssl_max_protocol_version = ''
 #ssl_dh_params_file = ''
 #ssl_passphrase_command = ''
 #ssl_passphrase_command_supports_reload = off
@ -123,32 +127,39 @@ shared_buffers = 8GB			# min 128kB
 					# (change requires restart)
 # Caution: it is not advisable to set max_prepared_transactions nonzero unless
 # you actively intend to use prepared transactions.
-work_mem = 20971kB			# min 64kB
+work_mem = 13981kB			# min 64kB
+#hash_mem_multiplier = 1.0		# 1-1000.0 multiplier on hash table work_mem
 maintenance_work_mem = 2GB		# min 1MB
 #autovacuum_work_mem = -1		# min 1MB, or -1 to use maintenance_work_mem
+#logical_decoding_work_mem = 64MB	# min 64kB
 #max_stack_depth = 2MB			# min 100kB
+#shared_memory_type = mmap		# the default is the first option
+					# supported by the operating system:
+					#   mmap
+					#   sysv
+					#   windows
+					# (change requires restart)
 dynamic_shared_memory_type = posix	# the default is the first option
 					# supported by the operating system:
 					#   posix
 					#   sysv
 					#   windows
 					#   mmap
-					# use none to disable dynamic shared memory
 					# (change requires restart)

 # - Disk -

 #temp_file_limit = -1			# limits per-process temp file space
-					# in kB, or -1 for no limit
+					# in kilobytes, or -1 for no limit

 # - Kernel Resources -

-#max_files_per_process = 1000		# min 25
+#max_files_per_process = 1000		# min 64
 					# (change requires restart)

 # - Cost-Based Vacuum Delay -

-#vacuum_cost_delay = 0			# 0-100 milliseconds
+#vacuum_cost_delay = 0			# 0-100 milliseconds (0 disables)
 #vacuum_cost_page_hit = 1		# 0-10000 credits
 #vacuum_cost_page_miss = 10		# 0-10000 credits
 #vacuum_cost_page_dirty = 20		# 0-10000 credits
@ -164,11 +175,12 @@ dynamic_shared_memory_type = posix	# the default is the first option
 # - Asynchronous Behavior -

 effective_io_concurrency = 200		# 1-1000; 0 disables prefetching
-#max_worker_processes = 4		# (change requires restart)
-#max_parallel_maintenance_workers = 2	# taken from max_parallel_workers
-#max_parallel_workers_per_gather = 2	# taken from max_parallel_workers
+#maintenance_io_concurrency = 10	# 1-1000; 0 disables prefetching
+#max_worker_processes = 6		# (change requires restart)
+#max_parallel_maintenance_workers = 3	# taken from max_parallel_workers
+#max_parallel_workers_per_gather = 3	# taken from max_parallel_workers
 #parallel_leader_participation = on
-#max_parallel_workers = 4		# maximum number of max_worker_processes that
+#max_parallel_workers = 6		# maximum number of max_worker_processes that
 					# can be used in parallel operations
 #old_snapshot_threshold = -1		# 1min-60d; -1 disables; 0 is immediate
 					# (change requires restart)
@ -191,7 +203,7 @@ synchronous_commit = off		# synchronization level;
 #wal_sync_method = fsync		# the default is the first option
 					# supported by the operating system:
 					#   open_datasync
-					#   fdatasync (default on Linux)
+					#   fdatasync (default on Linux and FreeBSD)
 					#   fsync
 					#   fsync_writethrough
 					#   open_sync
@ -199,10 +211,13 @@ synchronous_commit = off		# synchronization level;
 #wal_compression = off			# enable compression of full-page writes
 #wal_log_hints = off			# also do full page writes of non-critical updates
 					# (change requires restart)
+#wal_init_zero = on			# zero-fill new WAL files
+#wal_recycle = on			# recycle WAL files
 wal_buffers = 16MB			# min 32kB, -1 sets based on shared_buffers
 					# (change requires restart)
 #wal_writer_delay = 200ms		# 1-10000 milliseconds
 #wal_writer_flush_after = 1MB		# measured in pages, 0 disables
+#wal_skip_threshold = 2MB

 #commit_delay = 0			# range 0-100000, in microseconds
 #commit_siblings = 5			# range 1-1000
@ -210,9 +225,9 @@ wal_buffers = 16MB			# min 32kB, -1 sets based on shared_buffers
 # - Checkpoints -

 #checkpoint_timeout = 5min		# range 30s-1d
-max_wal_size = 4GB
-min_wal_size = 1GB
-checkpoint_completion_target = 0.8	# checkpoint target duration, 0.0 - 1.0
+max_wal_size = 8GB
+min_wal_size = 2GB
+checkpoint_completion_target = 0.9	# checkpoint target duration, 0.0 - 1.0
 #checkpoint_flush_after = 256kB		# measured in pages, 0 disables
 #checkpoint_warning = 30s		# 0 disables

@ -227,6 +242,42 @@ checkpoint_completion_target = 0.8	# checkpoint target duration, 0.0 - 1.0
 #archive_timeout = 0		# force a logfile segment switch after this
 				# number of seconds; 0 disables

+# - Archive Recovery -
+
+# These are only used in recovery mode.
+
+#restore_command = ''		# command to use to restore an archived logfile segment
+				# placeholders: %p = path of file to restore
+				#               %f = file name only
+				# e.g. 'cp /mnt/server/archivedir/%f %p'
+				# (change requires restart)
+#archive_cleanup_command = ''	# command to execute at every restartpoint
+#recovery_end_command = ''	# command to execute at completion of recovery
+
+# - Recovery Target -
+
+# Set these only when performing a targeted recovery.
+
+#recovery_target = ''		# 'immediate' to end recovery as soon as a
+                                # consistent state is reached
+				# (change requires restart)
+#recovery_target_name = ''	# the named restore point to which recovery will proceed
+				# (change requires restart)
+#recovery_target_time = ''	# the time stamp up to which recovery will proceed
+				# (change requires restart)
+#recovery_target_xid = ''	# the transaction ID up to which recovery will proceed
+				# (change requires restart)
+#recovery_target_lsn = ''	# the WAL LSN up to which recovery will proceed
+				# (change requires restart)
+#recovery_target_inclusive = on # Specifies whether to stop:
+				# just after the specified recovery target (on)
+				# just before the recovery target (off)
+				# (change requires restart)
+#recovery_target_timeline = 'latest'	# 'current', 'latest', or timeline ID
+				# (change requires restart)
+#recovery_target_action = 'pause'	# 'pause', 'promote', 'shutdown'
+				# (change requires restart)
+

 #------------------------------------------------------------------------------
 # REPLICATION
@ -238,7 +289,8 @@ checkpoint_completion_target = 0.8	# checkpoint target duration, 0.0 - 1.0

 #max_wal_senders = 10		# max number of walsender processes
 				# (change requires restart)
-#wal_keep_segments = 0		# in logfile segments; 0 disables
+#wal_keep_size = 0		# in megabytes; 0 disables
+#max_slot_wal_keep_size = -1	# in megabytes; -1 disables
 #wal_sender_timeout = 60s	# in milliseconds; 0 disables

 #max_replication_slots = 10	# max number of replication slots
@ -260,6 +312,9 @@ checkpoint_completion_target = 0.8	# checkpoint target duration, 0.0 - 1.0

 # These settings are ignored on a master server.

+#primary_conninfo = ''			# connection string to sending server
+#primary_slot_name = ''			# replication slot on sending server
+#promote_trigger_file = ''		# file name whose presence ends recovery
 #hot_standby = on			# "off" disallows queries during recovery
 					# (change requires restart)
 #max_standby_archive_delay = 30s	# max delay before canceling queries
@ -268,6 +323,8 @@ checkpoint_completion_target = 0.8	# checkpoint target duration, 0.0 - 1.0
 #max_standby_streaming_delay = 30s	# max delay before canceling queries
 					# when reading streaming WAL;
 					# -1 allows indefinite delay
+#wal_receiver_create_temp_slot = off	# create temp slot if primary_slot_name
+					# is not set
 #wal_receiver_status_interval = 10s	# send replies at least this often
 					# 0 disables
 #hot_standby_feedback = off		# send info from standby to prevent
@ -277,6 +334,7 @@ checkpoint_completion_target = 0.8	# checkpoint target duration, 0.0 - 1.0
 					# in milliseconds; 0 disables
 #wal_retrieve_retry_interval = 5s	# time to wait before retrying to
 					# retrieve WAL after a failed attempt
+#recovery_min_apply_delay = 0		# minimum delay for applying changes during recovery

 # - Subscribers -

@ -304,6 +362,7 @@ checkpoint_completion_target = 0.8	# checkpoint target duration, 0.0 - 1.0
 #enable_parallel_append = on
 #enable_seqscan = on
 #enable_sort = on
+#enable_incremental_sort = on
 #enable_tidscan = on
 #enable_partitionwise_join = off
 #enable_partitionwise_aggregate = off
@ -331,7 +390,7 @@ random_page_cost = 1.1			# same scale as above

 #min_parallel_table_scan_size = 8MB
 #min_parallel_index_scan_size = 512kB
-effective_cache_size = 14GB
+effective_cache_size = 24GB

 # - Genetic Query Optimizer -

@ -352,7 +411,9 @@ default_statistics_target = 100	# range 1-10000
 #join_collapse_limit = 8		# 1 disables collapsing of explicit
 					# JOIN clauses
 #force_parallel_mode = off
-#jit = off				# allow JIT compilation
+#jit = on				# allow JIT compilation
+#plan_cache_mode = auto			# auto, force_generic_plan or
+					# force_custom_plan


 #------------------------------------------------------------------------------
@ -438,6 +499,20 @@ default_statistics_target = 100	# range 1-10000
 					# statements running at least this number
 					# of milliseconds

+#log_min_duration_sample = -1		# -1 is disabled, 0 logs a sample of statements
+					# and their durations, > 0 logs only a sample of
+					# statements running at least this number
+					# of milliseconds;
+					# sample fraction is determined by log_statement_sample_rate
+
+#log_statement_sample_rate = 1.0	# fraction of logged statements exceeding
+					# log_min_duration_sample to be logged;
+					# 1.0 logs all such statements, 0.0 never logs
+
+
+#log_transaction_sample_rate = 0.0	# fraction of transactions whose statements
+					# are logged regardless of their duration; 1.0 logs all
+					# statements from all transactions, 0.0 never logs

 # - What to Log -

@ -457,6 +532,7 @@ log_line_prefix = '%m [%p] %q%u@%d '		# special values:
 					#   %d = database name
 					#   %r = remote host and port
 					#   %h = remote host
+					#   %b = backend type
 					#   %p = process ID
 					#   %t = timestamp without milliseconds
 					#   %m = timestamp with milliseconds
@ -473,6 +549,12 @@ log_line_prefix = '%m [%p] %q%u@%d '		# special values:
 					#   %% = '%'
 					# e.g. '<%u%%%d> '
 #log_lock_waits = off			# log lock waits >= deadlock_timeout
+#log_parameter_max_length = -1		# when logging statements, limit logged
+					# bind-parameter values to N bytes;
+					# -1 means print in full, 0 disables
+#log_parameter_max_length_on_error = 0	# when logging an error, limit logged
+					# bind-parameter values to N bytes;
+					# -1 means print in full, 0 disables
 #log_statement = 'none'			# none, ddl, mod, all
 #log_replication_commands = off
 #log_temp_files = -1			# log temporary files equal or larger
@ -484,7 +566,7 @@ log_timezone = 'Etc/UTC'
 # PROCESS TITLE
 #------------------------------------------------------------------------------

-cluster_name = '11/main'			# added to process titles if nonempty
+cluster_name = '13/main'			# added to process titles if nonempty
 					# (change requires restart)
 #update_process_title = on

@ -500,7 +582,7 @@ cluster_name = '11/main'			# added to process titles if nonempty
 #track_io_timing = off
 #track_functions = none			# none, pl, all
 #track_activity_query_size = 1024	# (change requires restart)
-stats_temp_directory = '/var/run/postgresql/11-main.pg_stat_tmp'
+stats_temp_directory = '/var/run/postgresql/13-main.pg_stat_tmp'


 # - Monitoring -
@ -526,16 +608,21 @@ stats_temp_directory = '/var/run/postgresql/11-main.pg_stat_tmp'
 #autovacuum_naptime = 1min		# time between autovacuum runs
 #autovacuum_vacuum_threshold = 50	# min number of row updates before
 					# vacuum
+#autovacuum_vacuum_insert_threshold = 1000	# min number of row inserts
+					# before vacuum; -1 disables insert
+					# vacuums
 #autovacuum_analyze_threshold = 50	# min number of row updates before
 					# analyze
 #autovacuum_vacuum_scale_factor = 0.2	# fraction of table size before vacuum
+#autovacuum_vacuum_insert_scale_factor = 0.2	# fraction of inserts over table
+					# size before insert vacuum
 #autovacuum_analyze_scale_factor = 0.1	# fraction of table size before analyze
 #autovacuum_freeze_max_age = 200000000	# maximum XID age before forced vacuum
 					# (change requires restart)
 #autovacuum_multixact_freeze_max_age = 400000000	# maximum multixact age
 					# before forced vacuum
 					# (change requires restart)
-#autovacuum_vacuum_cost_delay = 20ms	# default vacuum cost delay for
+#autovacuum_vacuum_cost_delay = 2ms	# default vacuum cost delay for
 					# autovacuum, in milliseconds;
 					# -1 means use vacuum_cost_delay
 #autovacuum_vacuum_cost_limit = -1	# default vacuum cost limit for
@ -564,6 +651,7 @@ stats_temp_directory = '/var/run/postgresql/11-main.pg_stat_tmp'
 #default_tablespace = ''		# a tablespace name, '' uses the default
 #temp_tablespaces = ''			# a list of tablespace names, '' uses
 					# only default tablespace
+#default_table_access_method = 'heap'
 #check_function_bodies = on
 #default_transaction_isolation = 'read committed'
 #default_transaction_read_only = off
@ -597,7 +685,8 @@ timezone = 'Etc/UTC'
 					#   India
 					# You can create your own file in
 					# share/timezonesets/.
-#extra_float_digits = 0			# min -15, max 3
+#extra_float_digits = 1			# min -15, max 3; any value >0 actually
+					# selects precise output mode
 #client_encoding = sql_ascii		# actually, defaults to database
 					# encoding

@ -621,6 +710,8 @@ default_text_search_config = 'pg_catalog.english'
 # - Other Defaults -

 #dynamic_library_path = '$libdir'
+#extension_destdir = ''			# prepend path when loading extensions
+					# and shared objects (added by Debian)


 #------------------------------------------------------------------------------
@ -646,7 +737,6 @@ default_text_search_config = 'pg_catalog.english'

 #array_nulls = on
 #backslash_quote = safe_encoding	# on, off, or safe_encoding
-#default_with_oids = off
 #escape_string_warning = on
 #lo_compat_privileges = off
 #operator_precedence_warning = off
@ -675,12 +765,13 @@ default_text_search_config = 'pg_catalog.english'
 #------------------------------------------------------------------------------

 # These options allow settings to be loaded from files other than the
-# default postgresql.conf.
+# default postgresql.conf.  Note that these are directives, not variable
+# assignments, so they can usefully be given more than once.

 include_dir = 'conf.d'			# include files ending in '.conf' from
 					# a directory, e.g., 'conf.d'
-#include_if_exists = ''			# include file only if it exists
-#include = ''				# include file
+#include_if_exists = '...'		# include file only if it exists
+#include = '...'			# include file


 #------------------------------------------------------------------------------