void-packages/srcpkgs/synapse/patches/sample_config.patch

89 lines
3 KiB
Diff
Raw Normal View History

diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 6696ed5d1..f17661fff 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -68,11 +68,11 @@ modules:
# lowercase and may contain an explicit port.
# Examples: matrix.org, localhost:8080
#
-server_name: "SERVERNAME"
+#server_name: "SERVERNAME"
# When running as a daemon, the file to store the pid in
#
-pid_file: DATADIR/homeserver.pid
+#pid_file: /var/lib/synapse/homeserver.pid
# The absolute URL to the web client which /_matrix/client will redirect
# to if 'webclient' is configured under the 'listeners' configuration.
@@ -370,8 +370,8 @@ manhole_settings:
# If these are left unset, then hardcoded and non-secret keys are used,
# which could allow traffic to be intercepted if sent over a public network.
#
- #ssh_priv_key_path: CONFDIR/id_rsa
- #ssh_pub_key_path: CONFDIR/id_rsa.pub
+ #ssh_priv_key_path: /etc/synapse/id_rsa
+ #ssh_pub_key_path: /etc/synapse/id_rsa.pub
# Forward extremities can build up in a room due to networking delays between
# homeservers. Once this happens in a large room, calculation of the state of
@@ -614,11 +614,11 @@ retention:
# any intermediate certificates (for instance, if using certbot, use
# `fullchain.pem` as your certificate, not `cert.pem`).
#
-#tls_certificate_path: "CONFDIR/SERVERNAME.tls.crt"
+#tls_certificate_path: "/etc/synapse/SERVERNAME.tls.crt"
# PEM-encoded private key for TLS
#
-#tls_private_key_path: "CONFDIR/SERVERNAME.tls.key"
+#tls_private_key_path: "/etc/synapse/SERVERNAME.tls.key"
# Whether to verify TLS server certificates for outbound federation requests.
#
@@ -808,7 +808,7 @@ caches:
database:
name: sqlite3
args:
- database: DATADIR/homeserver.db
+ database: /var/lib/synapse/homeserver.db
## Logging ##
@@ -816,7 +816,7 @@ database:
# A yaml python logging config file as described by
# https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema
#
-log_config: "CONFDIR/SERVERNAME.log.config"
+log_config: "/etc/synapse/log.yaml"
## Ratelimiting ##
@@ -942,7 +942,7 @@ log_config: "CONFDIR/SERVERNAME.log.config"
# Directory where uploaded images and attachments are stored.
#
-media_store_path: "DATADIR/media_store"
+media_store_path: "/var/lib/synapse/media_store"
# Media storage providers allow media to be stored in different
# locations.
@@ -1531,7 +1531,7 @@ room_prejoin_state:
# Path to the signing key to sign messages with
#
-signing_key_path: "CONFDIR/SERVERNAME.signing.key"
+signing_key_path: "/etc/synapse/SERVERNAME.signing.key"
# The keys that the server used to sign messages with but won't use
# to sign new messages.
@@ -1710,7 +1710,7 @@ saml2_config:
# Instead of putting the config inline as above, you can specify a
# separate pysaml2 configuration file:
#
- #config_path: "CONFDIR/sp_conf.py"
+ #config_path: "/etc/synapse/sp_conf.py"
# The lifetime of a SAML session. This defines how long a user has to
# complete the authentication process, if allow_unsolicited is unset.