Marcus Rueckert
029fd6c091
- refresh matrix-synapse-1.4.1-paths.patch to apply cleanly again - Update to 1.119.0 OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=347
62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
Index: synapse/contrib/example_log_config.yaml
|
|
===================================================================
|
|
--- synapse.orig/contrib/example_log_config.yaml
|
|
+++ synapse/contrib/example_log_config.yaml
|
|
@@ -26,7 +26,7 @@ handlers:
|
|
file:
|
|
class: logging.handlers.RotatingFileHandler
|
|
formatter: fmt
|
|
- filename: /var/log/synapse/homeserver.log
|
|
+ filename: /var/log/matrix-synapse/homeserver.log
|
|
maxBytes: 100000000
|
|
backupCount: 3
|
|
filters: [context]
|
|
Index: synapse/synapse/config/key.py
|
|
===================================================================
|
|
--- synapse.orig/synapse/config/key.py
|
|
+++ synapse/synapse/config/key.py
|
|
@@ -117,7 +117,7 @@ class KeyConfig(Config):
|
|
signing_key_path = config.get("signing_key_path")
|
|
if signing_key_path is None:
|
|
signing_key_path = os.path.join(
|
|
- config_dir_path, config["server_name"] + ".signing.key"
|
|
+ '/etc/matrix-synapse/keys.d', config["server_name"] + ".signing.key"
|
|
)
|
|
|
|
self.signing_key = self.read_signing_keys(signing_key_path, "signing_key")
|
|
@@ -190,7 +190,7 @@ class KeyConfig(Config):
|
|
generate_secrets: bool = False,
|
|
**kwargs: Any,
|
|
) -> str:
|
|
- base_key_name = os.path.join(config_dir_path, server_name)
|
|
+ base_key_name = os.path.join('/etc/matrix-synapse/keys.d', server_name)
|
|
macaroon_secret_key = ""
|
|
form_secret = ""
|
|
|
|
Index: synapse/synapse/config/logger.py
|
|
===================================================================
|
|
--- synapse.orig/synapse/config/logger.py
|
|
+++ synapse/synapse/config/logger.py
|
|
@@ -156,7 +156,7 @@ class LoggingConfig(Config):
|
|
def generate_config_section(
|
|
self, config_dir_path: str, server_name: str, **kwargs: Any
|
|
) -> str:
|
|
- log_config = os.path.join(config_dir_path, server_name + ".log.config")
|
|
+ log_config = os.path.join('/etc/matrix-synapse/', server_name + ".log.config")
|
|
return """\
|
|
log_config: "%(log_config)s"
|
|
""" % locals()
|
|
Index: synapse/synapse/config/server.py
|
|
===================================================================
|
|
--- synapse.orig/synapse/config/server.py
|
|
+++ synapse/synapse/config/server.py
|
|
@@ -810,7 +810,7 @@ class ServerConfig(Config):
|
|
bind_port = 8448
|
|
unsecure_port = 8008
|
|
|
|
- pid_file = os.path.join(data_dir_path, "homeserver.pid")
|
|
+ pid_file = os.path.join("/run/matrix-synapse", "homeserver.pid")
|
|
|
|
secure_listeners = []
|
|
unsecure_listeners = []
|