* [PR PATCH] synapse: update to 1.49.2.
@ 2021-12-23 7:53 freshprince
2021-12-23 8:01 ` [PR PATCH] [Updated] " freshprince
` (21 more replies)
0 siblings, 22 replies; 23+ messages in thread
From: freshprince @ 2021-12-23 7:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]
There is a new pull request by freshprince against master on the void-packages repository
https://github.com/freshprince/void-packages synapse-1.49.2
https://github.com/void-linux/void-packages/pull/34676
synapse: update to 1.49.2.
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
Log to daemon.notice.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34676.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-1.49.2-34676.patch --]
[-- Type: text/x-diff, Size: 7178 bytes --]
From d84c25ac1e23d837da43f6c62129597d571a5f14 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Wed, 22 Dec 2021 10:58:51 +0100
Subject: [PATCH] synapse: update to 1.49.2.
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
Log to daemon.notice.
---
srcpkgs/synapse/files/synapse/log/run | 4 +-
srcpkgs/synapse/files/synapse/run | 3 +-
srcpkgs/synapse/patches/sample_config.patch | 88 -------------------
.../synapse/patches/sample_log_config.patch | 13 ---
srcpkgs/synapse/template | 7 +-
5 files changed, 9 insertions(+), 106 deletions(-)
mode change 120000 => 100644 srcpkgs/synapse/files/synapse/log/run
delete mode 100644 srcpkgs/synapse/patches/sample_config.patch
delete mode 100644 srcpkgs/synapse/patches/sample_log_config.patch
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/synapse/files/synapse/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
new file mode 100644
index 000000000000..6d902ea1e4b4
--- /dev/null
+++ b/srcpkgs/synapse/files/synapse/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t synapse
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 1ab3a5a8d54b..780499c8a511 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+[ -r ./conf ] && . ./conf
cd /var/lib/synapse
exec 2>&1
-exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
+exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
diff --git a/srcpkgs/synapse/patches/sample_config.patch b/srcpkgs/synapse/patches/sample_config.patch
deleted file mode 100644
index 15954e0cd782..000000000000
--- a/srcpkgs/synapse/patches/sample_config.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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.
diff --git a/srcpkgs/synapse/patches/sample_log_config.patch b/srcpkgs/synapse/patches/sample_log_config.patch
deleted file mode 100644
index e4196a446456..000000000000
--- a/srcpkgs/synapse/patches/sample_log_config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml
-index 2485ad25e..71465726b 100644
---- a/docs/sample_log_config.yaml
-+++ b/docs/sample_log_config.yaml
-@@ -19,7 +19,7 @@ handlers:
- file:
- class: logging.handlers.TimedRotatingFileHandler
- formatter: precise
-- filename: /var/log/matrix-synapse/homeserver.log
-+ filename: /var/log/synapse/homeserver.log
- when: midnight
- backupCount: 3 # Does not include the current log file.
- encoding: utf8
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 2452f6a26ca4..fd38593fb22b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.49.0
-revision=2
+version=1.49.2
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-frozendict python3-canonicaljson
@@ -19,13 +19,14 @@ license="Apache-2.0"
homepage="https://github.com/matrix-org/synapse"
changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=3c1b73eb36ec3af00868707b929f9b9d1faae9ccc4022c2c46bdb025ef0ead8e
+checksum=f5b0017e9d77db94fac853fbefbcb4538d879cb80f404b02003930c76f5cafab
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
make_dirs="
/var/lib/synapse 0700 synapse synapse
+ /etc/synapse 755 synapse synapse
/var/log/synapse 0755 synapse synapse"
do_check() {
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
@ 2021-12-23 8:01 ` freshprince
2021-12-30 2:57 ` TinfoilSubmarine
` (20 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2021-12-23 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
There is an updated pull request by freshprince against master on the void-packages repository
https://github.com/freshprince/void-packages synapse-1.49.2
https://github.com/void-linux/void-packages/pull/34676
synapse: update to 1.49.2.
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
Log to daemon.notice.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34676.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-1.49.2-34676.patch --]
[-- Type: text/x-diff, Size: 7178 bytes --]
From 833f37d3617d3dcceed404b8ff7783cf50b2cbeb Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Wed, 22 Dec 2021 10:58:51 +0100
Subject: [PATCH] synapse: update to 1.49.2.
Don't patch sample config.
Make run script configurable so that admin can change path to config
file and set locale if necessary.
Create /etc/synapse again.
Log to daemon.notice.
---
srcpkgs/synapse/files/synapse/log/run | 4 +-
srcpkgs/synapse/files/synapse/run | 3 +-
srcpkgs/synapse/patches/sample_config.patch | 88 -------------------
.../synapse/patches/sample_log_config.patch | 13 ---
srcpkgs/synapse/template | 7 +-
5 files changed, 9 insertions(+), 106 deletions(-)
mode change 120000 => 100644 srcpkgs/synapse/files/synapse/log/run
delete mode 100644 srcpkgs/synapse/patches/sample_config.patch
delete mode 100644 srcpkgs/synapse/patches/sample_log_config.patch
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/synapse/files/synapse/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
new file mode 100644
index 000000000000..6d902ea1e4b4
--- /dev/null
+++ b/srcpkgs/synapse/files/synapse/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t synapse
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 1ab3a5a8d54b..780499c8a511 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+[ -r ./conf ] && . ./conf
cd /var/lib/synapse
exec 2>&1
-exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
+exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
diff --git a/srcpkgs/synapse/patches/sample_config.patch b/srcpkgs/synapse/patches/sample_config.patch
deleted file mode 100644
index 15954e0cd782..000000000000
--- a/srcpkgs/synapse/patches/sample_config.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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.
diff --git a/srcpkgs/synapse/patches/sample_log_config.patch b/srcpkgs/synapse/patches/sample_log_config.patch
deleted file mode 100644
index e4196a446456..000000000000
--- a/srcpkgs/synapse/patches/sample_log_config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml
-index 2485ad25e..71465726b 100644
---- a/docs/sample_log_config.yaml
-+++ b/docs/sample_log_config.yaml
-@@ -19,7 +19,7 @@ handlers:
- file:
- class: logging.handlers.TimedRotatingFileHandler
- formatter: precise
-- filename: /var/log/matrix-synapse/homeserver.log
-+ filename: /var/log/synapse/homeserver.log
- when: midnight
- backupCount: 3 # Does not include the current log file.
- encoding: utf8
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 2452f6a26ca4..fd38593fb22b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.49.0
-revision=2
+version=1.49.2
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-frozendict python3-canonicaljson
@@ -19,13 +19,14 @@ license="Apache-2.0"
homepage="https://github.com/matrix-org/synapse"
changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=3c1b73eb36ec3af00868707b929f9b9d1faae9ccc4022c2c46bdb025ef0ead8e
+checksum=f5b0017e9d77db94fac853fbefbcb4538d879cb80f404b02003930c76f5cafab
system_accounts="synapse"
synapse_homedir="/var/lib/synapse"
make_dirs="
/var/lib/synapse 0700 synapse synapse
+ /etc/synapse 755 synapse synapse
/var/log/synapse 0755 synapse synapse"
do_check() {
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
2021-12-23 8:01 ` [PR PATCH] [Updated] " freshprince
@ 2021-12-30 2:57 ` TinfoilSubmarine
2021-12-30 2:59 ` TinfoilSubmarine
` (19 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2021-12-30 2:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1002851025
Comment:
Hi, just saw this PR. I've been maintaining the package and added the `/usr/bin/vlogger -> /etc/sv/synapse/log/run` symlink. Was curious what benefit directly `exec`ing `logger` has? I have this running on my system and synapse is already logging to daemon.notice.
The configurable config file location looks good to me.
For patching config files, I'd like to have the config file updates installed so that e.g. `xdiff` from xtools can be used to easily manage updates/changes to the synapse configuration. Currently that's waiting on https://github.com/void-linux/xbps/issues/441, then hopefully we can install to `/etc/synapse` instead of vsconf.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
2021-12-23 8:01 ` [PR PATCH] [Updated] " freshprince
2021-12-30 2:57 ` TinfoilSubmarine
@ 2021-12-30 2:59 ` TinfoilSubmarine
2021-12-30 3:11 ` TinfoilSubmarine
` (18 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2021-12-30 2:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 803 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1002851025
Comment:
Hi, just saw this PR. I've been maintaining the package and added the `/usr/bin/vlogger -> /etc/sv/synapse/log/run` symlink. Was curious what benefit directly `exec`ing `logger` has? I have this running on my system and synapse is already logging to daemon.notice.
The configurable config file location looks good to me.
For patching config files, I'd like to have the config file updates installed so that e.g. `xdiff` from xtools can be used to easily manage updates/changes to the synapse configuration. Currently that's waiting on https://github.com/void-linux/xbps/pull/426, then hopefully we can install to `/etc/synapse` instead of vsconf.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (2 preceding siblings ...)
2021-12-30 2:59 ` TinfoilSubmarine
@ 2021-12-30 3:11 ` TinfoilSubmarine
2021-12-30 10:44 ` freshprince
` (17 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2021-12-30 3:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1002853882
Comment:
Should also mention that https://github.com/void-linux/void-packages/pull/34682 has already been merged.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (3 preceding siblings ...)
2021-12-30 3:11 ` TinfoilSubmarine
@ 2021-12-30 10:44 ` freshprince
2021-12-30 10:54 ` freshprince
` (16 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2021-12-30 10:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]
New comment by freshprince on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1002971905
Comment:
> Was curious what benefit directly execing logger has? I have this running on my system and synapse is already logging to daemon.notice.
I was used to see error output in the logging space of `runsvdir`, when I saw that there was a logging service running for synapse there was no easy way for me to see where it is logging to. All other services I use do have explicitly set where they are logging to and in this case explicit is better than implicit because if you want to check logs you shouldn't need to know what's the default behaviour of vlogger.
> For patching config files, I'd like to have the config file updates installed so that e.g. xdiff from xtools can be used to easily manage updates/changes to the synapse configuration. Currently that's waiting on void-linux/xbps#426, then hopefully we can install to /etc/synapse instead of vsconf.
If you read the [first three paragraphs of the config file that you want to install](https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml) you see that this config file is not intendet to be copied into `/etc/synapse`, patched or otherwise. The config does contain several secrets that should be randomly generated and for this the correct and documented way is to use `generate_config`. Regardles of the behaviour of xbps that resulted in https://github.com/void-linux/xbps/issues/441.
Please test your patches before you create pull requests.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (4 preceding siblings ...)
2021-12-30 10:44 ` freshprince
@ 2021-12-30 10:54 ` freshprince
2021-12-30 14:49 ` TinfoilSubmarine
` (15 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2021-12-30 10:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]
New comment by freshprince on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1002971905
Comment:
> Was curious what benefit directly execing logger has? I have this running on my system and synapse is already logging to daemon.notice.
I was used to see error output in the logging space of `runsvdir`, when I saw that there was a logging service running for synapse there was no easy way for me to see where it is logging to. All other services I use do have explicitly set where they are logging to and in this case explicit is better than implicit because if you want to check logs you shouldn't need to know what's the default behaviour of vlogger.
> For patching config files, I'd like to have the config file updates installed so that e.g. xdiff from xtools can be used to easily manage updates/changes to the synapse configuration. Currently that's waiting on void-linux/xbps#426, then hopefully we can install to /etc/synapse instead of vsconf.
If you read the [first three paragraphs of the config file that you want to install](https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml) you see that this config file is not intended to be copied into `/etc/synapse`, patched or otherwise. The config does contain several secrets that should be randomly generated and for this the correct and documented way is to use `generate_config`. Regardless of the behaviour of xbps that resulted in https://github.com/void-linux/xbps/issues/441.
Please test your patches before you create pull requests.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (5 preceding siblings ...)
2021-12-30 10:54 ` freshprince
@ 2021-12-30 14:49 ` TinfoilSubmarine
2021-12-31 8:51 ` [PR PATCH] [Updated] " freshprince
` (14 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2021-12-30 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1003061398
Comment:
> explicit is better than implicit because if you want to check logs you shouldn't need to know what's the default behaviour of vlogger
We'll need to have a Void team member weigh in on this because the history of the logging service (introduced in https://github.com/void-linux/void-packages/pull/31263) was what made me start using vlogger instead of the older `exec logger ...` pattern.
> If you read the [first three paragraphs of the config file that you want to install](https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml) you see that this config file is not intended to be copied into `/etc/synapse`, patched or otherwise. The config does contain several secrets that should be randomly generated and for this the correct and documented way is to use `generate_config`
I compared the output of `generate_config` with the patched `sample_config.yaml` and the only difference was that the header was included and the `log_config` location differed slightly. You are correct that this is confusing, so likely these paragraphs should be patched out as well. As far as secret generation, that is optional for having a working server, I specifically tested this. The comments above the three secrets that would be generated (`registration_shared_secret`, `macaroon_secret_key`, and `form_secret`) indicate that these are either optional or only needed for advanced functionality such as consent forms.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (6 preceding siblings ...)
2021-12-30 14:49 ` TinfoilSubmarine
@ 2021-12-31 8:51 ` freshprince
2021-12-31 8:53 ` freshprince
` (13 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2021-12-31 8:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
There is an updated pull request by freshprince against master on the void-packages repository
https://github.com/freshprince/void-packages synapse-1.49.2
https://github.com/void-linux/void-packages/pull/34676
synapse: update to 1.49.2.
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
Log to daemon.notice.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34676.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-1.49.2-34676.patch --]
[-- Type: text/x-diff, Size: 7006 bytes --]
From e7d20a65c17035d1736295e40607ba3daf2eb38f Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:45:03 +0100
Subject: [PATCH 1/4] synapse: remove logging process
By default synapse only logs to stderr when there is a problem with
configuration. For this we don't need a process running that won't do
anything for 99% of the time. Logging to runsvdir should be enough.
---
srcpkgs/synapse/files/synapse/log/run | 1 -
1 file changed, 1 deletion(-)
delete mode 120000 srcpkgs/synapse/files/synapse/log/run
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/synapse/files/synapse/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
From 40d27a1aaea83e7cd7eea64138ca3bc43e9fecc3 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:48:57 +0100
Subject: [PATCH 2/4] synapse: make service configurable
That way one can set desired locale and path to config file.
---
srcpkgs/synapse/files/synapse/run | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 1ab3a5a8d54b..780499c8a511 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+[ -r ./conf ] && . ./conf
cd /var/lib/synapse
exec 2>&1
-exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
+exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
From 97ca190628f1cd431488652f270b4a67859f9a74 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:50:33 +0100
Subject: [PATCH 3/4] synapse: remove unnecessary patches to sample config
---
srcpkgs/synapse/patches/sample_config.patch | 88 -------------------
.../synapse/patches/sample_log_config.patch | 13 ---
2 files changed, 101 deletions(-)
delete mode 100644 srcpkgs/synapse/patches/sample_config.patch
delete mode 100644 srcpkgs/synapse/patches/sample_log_config.patch
diff --git a/srcpkgs/synapse/patches/sample_config.patch b/srcpkgs/synapse/patches/sample_config.patch
deleted file mode 100644
index 15954e0cd782..000000000000
--- a/srcpkgs/synapse/patches/sample_config.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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.
diff --git a/srcpkgs/synapse/patches/sample_log_config.patch b/srcpkgs/synapse/patches/sample_log_config.patch
deleted file mode 100644
index e4196a446456..000000000000
--- a/srcpkgs/synapse/patches/sample_log_config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml
-index 2485ad25e..71465726b 100644
---- a/docs/sample_log_config.yaml
-+++ b/docs/sample_log_config.yaml
-@@ -19,7 +19,7 @@ handlers:
- file:
- class: logging.handlers.TimedRotatingFileHandler
- formatter: precise
-- filename: /var/log/matrix-synapse/homeserver.log
-+ filename: /var/log/synapse/homeserver.log
- when: midnight
- backupCount: 3 # Does not include the current log file.
- encoding: utf8
From 625436918e0e7ca8467272931dda937eced0955c Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:51:01 +0100
Subject: [PATCH 4/4] synapse: create directory for config
---
srcpkgs/synapse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index abdb2e314e62..fd38593fb22b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -26,6 +26,7 @@ synapse_homedir="/var/lib/synapse"
make_dirs="
/var/lib/synapse 0700 synapse synapse
+ /etc/synapse 755 synapse synapse
/var/log/synapse 0755 synapse synapse"
do_check() {
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (7 preceding siblings ...)
2021-12-31 8:51 ` [PR PATCH] [Updated] " freshprince
@ 2021-12-31 8:53 ` freshprince
2021-12-31 9:02 ` freshprince
` (12 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2021-12-31 8:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1422 bytes --]
There is an updated pull request by freshprince against master on the void-packages repository
https://github.com/freshprince/void-packages synapse-1.49.2
https://github.com/void-linux/void-packages/pull/34676
synapse: update to 1.49.2.
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
Log to daemon.notice.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34676.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-1.49.2-34676.patch --]
[-- Type: text/x-diff, Size: 7010 bytes --]
From 530b49745083b2cb48994710d15223f84c83e2a5 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:45:03 +0100
Subject: [PATCH 1/4] synapse: remove logging process.
By default synapse only logs to stderr when there is a problem with
configuration. For this we don't need a process running that won't do
anything for 99% of the time. Logging to runsvdir should be enough.
---
srcpkgs/synapse/files/synapse/log/run | 1 -
1 file changed, 1 deletion(-)
delete mode 120000 srcpkgs/synapse/files/synapse/log/run
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/synapse/files/synapse/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
From 907d860ca721f78d5ae61e33558e123e592ccd3e Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:48:57 +0100
Subject: [PATCH 2/4] synapse: make service configurable.
That way one can set desired locale and path to config file.
---
srcpkgs/synapse/files/synapse/run | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 1ab3a5a8d54b..780499c8a511 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+[ -r ./conf ] && . ./conf
cd /var/lib/synapse
exec 2>&1
-exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
+exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
From 4d53ddef791f907bd7433bf35eb3a8787b4592ec Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:50:33 +0100
Subject: [PATCH 3/4] synapse: remove unnecessary patches to sample config.
---
srcpkgs/synapse/patches/sample_config.patch | 88 -------------------
.../synapse/patches/sample_log_config.patch | 13 ---
2 files changed, 101 deletions(-)
delete mode 100644 srcpkgs/synapse/patches/sample_config.patch
delete mode 100644 srcpkgs/synapse/patches/sample_log_config.patch
diff --git a/srcpkgs/synapse/patches/sample_config.patch b/srcpkgs/synapse/patches/sample_config.patch
deleted file mode 100644
index 15954e0cd782..000000000000
--- a/srcpkgs/synapse/patches/sample_config.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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.
diff --git a/srcpkgs/synapse/patches/sample_log_config.patch b/srcpkgs/synapse/patches/sample_log_config.patch
deleted file mode 100644
index e4196a446456..000000000000
--- a/srcpkgs/synapse/patches/sample_log_config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml
-index 2485ad25e..71465726b 100644
---- a/docs/sample_log_config.yaml
-+++ b/docs/sample_log_config.yaml
-@@ -19,7 +19,7 @@ handlers:
- file:
- class: logging.handlers.TimedRotatingFileHandler
- formatter: precise
-- filename: /var/log/matrix-synapse/homeserver.log
-+ filename: /var/log/synapse/homeserver.log
- when: midnight
- backupCount: 3 # Does not include the current log file.
- encoding: utf8
From 56f5baca0431c95a6bfec114278376a346f19129 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:51:01 +0100
Subject: [PATCH 4/4] synapse: create directory for config.
---
srcpkgs/synapse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index abdb2e314e62..fd38593fb22b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -26,6 +26,7 @@ synapse_homedir="/var/lib/synapse"
make_dirs="
/var/lib/synapse 0700 synapse synapse
+ /etc/synapse 755 synapse synapse
/var/log/synapse 0755 synapse synapse"
do_check() {
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: update to 1.49.2.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (8 preceding siblings ...)
2021-12-31 8:53 ` freshprince
@ 2021-12-31 9:02 ` freshprince
2021-12-31 9:11 ` [PR PATCH] [Updated] synapse: minor changes freshprince
` (11 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2021-12-31 9:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]
New comment by freshprince on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1003314686
Comment:
>> explicit is better than implicit because if you want to check logs you
>> shouldn't need to know what's the default behaviour of vlogger
> We'll need to have a Void team member weigh in on this because the history of
> the logging service (introduced in #31263) was what made me start using
> vlogger instead of the older exec logger ... pattern.
For synapse, logging of stderr doesn't really make sense anyway since it only
produces output when there's a problem with the configuration.
> You are correct that this is confusing, so likely these paragraphs should be
> patched out as well.
Sure you can ignore what the authors of the software and people that use it
tell you and do it anyway.
> these are either optional or only needed for advanced functionality
If registering a user in the command line (which you do when you follow the
installation instructions) is advanced functionality for you.
I've rearranged my patches. Feel free to do with them as you please. I'll just
```
echo -e "preserve=/etc/synapse/*\npreserve=/etc/sv/synapse/*" >> /etc/xbps.d/synapse.conf
```
and be done with it.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (9 preceding siblings ...)
2021-12-31 9:02 ` freshprince
@ 2021-12-31 9:11 ` freshprince
2021-12-31 17:09 ` TinfoilSubmarine
` (10 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2021-12-31 9:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
There is an updated pull request by freshprince against master on the void-packages repository
https://github.com/freshprince/void-packages synapse-1.49.2
https://github.com/void-linux/void-packages/pull/34676
synapse: minor changes.
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
~Log to daemon.notice.~ Logging daemon is not really necessary for this.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34676.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-1.49.2-34676.patch --]
[-- Type: text/x-diff, Size: 7390 bytes --]
From 7b1eba69764124948a6466156267ab262715c267 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:45:03 +0100
Subject: [PATCH 1/4] synapse: remove logging process.
By default synapse only logs to stderr when there is a problem with
configuration. For this we don't need a process running that won't do
anything for 99% of the time. Logging to runsvdir should be enough.
---
srcpkgs/synapse/files/synapse/log/run | 1 -
srcpkgs/synapse/files/synapse/run | 1 -
2 files changed, 2 deletions(-)
delete mode 120000 srcpkgs/synapse/files/synapse/log/run
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/synapse/files/synapse/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 1ab3a5a8d54b..b0ed0c0b28b3 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,3 @@
#!/bin/sh
cd /var/lib/synapse
-exec 2>&1
exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
From b401803972e7c877725b0eb319f965cd5f6387bd Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:48:57 +0100
Subject: [PATCH 2/4] synapse: make service configurable.
That way one can set desired locale and path to config file.
---
srcpkgs/synapse/files/synapse/run | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index b0ed0c0b28b3..0778d6317328 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,3 +1,4 @@
#!/bin/sh
+[ -r ./conf ] && . ./conf
cd /var/lib/synapse
-exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
+exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
From e2853706b03c5395ad5752226b92f3087266ada3 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:50:33 +0100
Subject: [PATCH 3/4] synapse: remove unnecessary patches to sample config.
---
srcpkgs/synapse/patches/sample_config.patch | 88 -------------------
.../synapse/patches/sample_log_config.patch | 13 ---
2 files changed, 101 deletions(-)
delete mode 100644 srcpkgs/synapse/patches/sample_config.patch
delete mode 100644 srcpkgs/synapse/patches/sample_log_config.patch
diff --git a/srcpkgs/synapse/patches/sample_config.patch b/srcpkgs/synapse/patches/sample_config.patch
deleted file mode 100644
index 15954e0cd782..000000000000
--- a/srcpkgs/synapse/patches/sample_config.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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.
diff --git a/srcpkgs/synapse/patches/sample_log_config.patch b/srcpkgs/synapse/patches/sample_log_config.patch
deleted file mode 100644
index e4196a446456..000000000000
--- a/srcpkgs/synapse/patches/sample_log_config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml
-index 2485ad25e..71465726b 100644
---- a/docs/sample_log_config.yaml
-+++ b/docs/sample_log_config.yaml
-@@ -19,7 +19,7 @@ handlers:
- file:
- class: logging.handlers.TimedRotatingFileHandler
- formatter: precise
-- filename: /var/log/matrix-synapse/homeserver.log
-+ filename: /var/log/synapse/homeserver.log
- when: midnight
- backupCount: 3 # Does not include the current log file.
- encoding: utf8
From 6df4a1fbb2a6cae96eddffc87c189ac26bfc0e3a Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:51:01 +0100
Subject: [PATCH 4/4] synapse: create directory for config.
---
srcpkgs/synapse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index abdb2e314e62..fd38593fb22b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -26,6 +26,7 @@ synapse_homedir="/var/lib/synapse"
make_dirs="
/var/lib/synapse 0700 synapse synapse
+ /etc/synapse 755 synapse synapse
/var/log/synapse 0755 synapse synapse"
do_check() {
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (10 preceding siblings ...)
2021-12-31 9:11 ` [PR PATCH] [Updated] synapse: minor changes freshprince
@ 2021-12-31 17:09 ` TinfoilSubmarine
2022-01-03 8:55 ` freshprince
` (9 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2021-12-31 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1003420015
Comment:
> For synapse, logging of stderr doesn't really make sense anyway since it only
> produces output when there's a problem with the configuration.
Being able to see those configuration problems raised in syslog makes debugging easier.
> Sure you can ignore what the authors of the software and people that use it
> tell you and do it anyway.
The `sample_config.yaml` file is generated by running `generate_config --header-file docs/.sample_config_header.yaml -o docs/sample_config.yaml`, so this is just removing the header of an otherwise valid config file.
> If registering a user in the command line (which you do when you follow the
> installation instructions) is advanced functionality for you.
I missed this when I was testing, thanks for pointing it out. I was struggling to find a "beginner" use-case that would be a blocker requiring that the secrets be generated and couldn't come up with one.
However, this isn't necessarily a bad thing. The Debian package maintained by the authors does the same thing -- they generate a default config without generated secrets and the user must manually supply them, see https://github.com/matrix-org/synapse/blob/develop/debian/build_virtualenv.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (11 preceding siblings ...)
2021-12-31 17:09 ` TinfoilSubmarine
@ 2022-01-03 8:55 ` freshprince
2022-01-03 16:03 ` TinfoilSubmarine
` (8 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2022-01-03 8:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]
New comment by freshprince on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1003946637
Comment:
> Being able to see those configuration problems raised in syslog makes debugging easier.
Syslog is not installed by default on void so you won't see the problems raised anywhere. If you think that installing socklog-void and knowing where vlogger logs to by default is easier than using `ps` and `pgrep runsvdir | xargs -I{} cat /proc/{}/cmdline` you should consider reading up on [runit](http://smarden.org/runit/). Which is the init system that void is using.
> The Debian package maintained by the authors does the same thing
That's a nice form of cargo-cult that begs for the statement that if you like how it's done in distribution X maybe you should switch to distribution X. If I remember correctly void is trying to provide packages as 'vanilla' as possible.
If one seriously wants to set up a synapse homeserver, they have to install synapse, get valid ssl certificates, set up a reverse proxy, install postgresql and set it up, add well-known files for clients and federation, have a working e-mail setup, set up a TURN server and start running different worker processes to do load balancing. I don't think that copying sample config files so that the service starts without failing after a fresh install helps a beginner doing any of that. But it might have wrong defaults like the name of the homeserver (which makes the generated sqlite-db unusable if you want to switch the name later) and missing randomly generated secrets as already mentioned. It also introduced problems for people that were already having a working setup.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (12 preceding siblings ...)
2022-01-03 8:55 ` freshprince
@ 2022-01-03 16:03 ` TinfoilSubmarine
2022-01-03 16:20 ` freshprince
` (7 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2022-01-03 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3304 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1004190591
Comment:
> Syslog is not installed by default on void so you won't see the problems raised anywhere. If you think that installing socklog-void and knowing where vlogger logs to by default is easier than using `ps` and `pgrep runsvdir | xargs -I{} cat /proc/{}/cmdline` you should consider reading up on [runit](http://smarden.org/runit/). Which is the init system that void is using.
Not trying to strawman here, but by this logic, it seems like no service in Void should be shipping a `$service/log` since we can just dig logs out of `/proc`? I'm legitimately curious what constitutes a valid reason for adding a logging service then.
> That's a nice form of cargo-cult that begs for the statement that if you like how it's done in distribution X maybe you should switch to distribution X. If I remember correctly void is trying to provide packages as 'vanilla' as possible.
I wasn't really pointing to "how Debian does it" as much as "the authors are using this approach as a way to ship their own software so maybe we can learn from it", but you are right that this may be a too vendored approach for Void.
> If one seriously wants to set up a synapse homeserver, they have to install synapse, get valid ssl certificates, set up a reverse proxy, install postgresql and set it up, add well-known files for clients and federation, have a working e-mail setup, set up a TURN server and start running different worker processes to do load balancing. I don't think that copying sample config files so that the service starts without failing after a fresh install helps a beginner doing any of that. But it might have wrong defaults like the name of the homeserver (which makes the generated sqlite-db unusable if you want to switch the name later) and missing randomly generated secrets as already mentioned. It also introduced problems for people that were already having a working setup.
I agree that making a few changes to a default config to get the synapse service running is not representative of the amount of work needed to actually stand-up a feature-complete synapse from scratch. The original reason I attempted to have a default config in place was to remove the existing `INSTALL` telling the user what to do, since that vendors setup instructions/info. Indeed, there's a lot more that the user starting from scratch will need to do than just run:
```
sudo -u synapse python3 -m synapse.app.homeserver \
--server-name my.domain.name \
--config-path /etc/synapse/homeserver.yaml \
--generate-config \
--report-stats=yes
```
which is all that `INSTALL` was telling new users to do. But, including this in `INSTALL` may be more in line with upstream documentation, since the [upstream installation instructions](https://matrix-org.github.io/synapse/latest/setup/installation.html) don't have an explicit step telling the user to generate their config file except if following the PyPI/virtualenv instructions. And [this page on configuration](https://matrix-org.github.io/synapse/latest/usage/configuration/index.html) just says that the configuration should have been generated when you installed synapse.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (13 preceding siblings ...)
2022-01-03 16:03 ` TinfoilSubmarine
@ 2022-01-03 16:20 ` freshprince
2022-01-03 17:44 ` TinfoilSubmarine
` (6 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2022-01-03 16:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
New comment by freshprince on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1004202502
Comment:
> but by this logic, it seems like no service in Void should be shipping a $service/log since we can just dig logs out of /proc? I'm legitimately curious what constitutes a valid reason for adding a logging service then.
synapse has it's own logging facilities. By default it logs to a logfile in `/var/log/synapse`. It can log to syslog or stdout too if the user wants that and configures it to. synapse only spews stuff out to stderr when there is a problem with the configuration and the service fails to start of if you explicitly tell it to.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (14 preceding siblings ...)
2022-01-03 16:20 ` freshprince
@ 2022-01-03 17:44 ` TinfoilSubmarine
2022-01-03 17:44 ` TinfoilSubmarine
` (5 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2022-01-03 17:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1004251460
Comment:
It can log to syslog
Oh, I didn't realize `logging.handlers.SysLogHandler` existed, TIL, thanks!
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (15 preceding siblings ...)
2022-01-03 17:44 ` TinfoilSubmarine
@ 2022-01-03 17:44 ` TinfoilSubmarine
2022-01-05 0:58 ` TinfoilSubmarine
` (4 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2022-01-03 17:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1004251460
Comment:
> It can log to syslog
Oh, I didn't realize `logging.handlers.SysLogHandler` existed, TIL, thanks!
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (16 preceding siblings ...)
2022-01-03 17:44 ` TinfoilSubmarine
@ 2022-01-05 0:58 ` TinfoilSubmarine
2022-01-05 8:20 ` [PR PATCH] [Updated] " freshprince
` (3 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: TinfoilSubmarine @ 2022-01-05 0:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1005291893
Comment:
Anyways, I'm OK with these commits. I think they will need to be squashed into one commit, or I can add them to the next version.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (17 preceding siblings ...)
2022-01-05 0:58 ` TinfoilSubmarine
@ 2022-01-05 8:20 ` freshprince
2022-01-05 12:18 ` freshprince
` (2 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2022-01-05 8:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
There is an updated pull request by freshprince against master on the void-packages repository
https://github.com/freshprince/void-packages synapse-1.49.2
https://github.com/void-linux/void-packages/pull/34676
synapse: minor changes.
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
~Log to daemon.notice.~ Logging daemon is not really necessary for this.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34676.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-1.49.2-34676.patch --]
[-- Type: text/x-diff, Size: 8091 bytes --]
From d5eb0cccdd0a829147b505d15be798f279733830 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:45:03 +0100
Subject: [PATCH 1/5] synapse: remove logging process.
By default synapse only logs to stderr when there is a problem with
configuration. For this we don't need a process running that won't do
anything for 99% of the time. Logging to runsvdir should be enough.
---
srcpkgs/synapse/files/synapse/log/run | 1 -
srcpkgs/synapse/files/synapse/run | 1 -
2 files changed, 2 deletions(-)
delete mode 120000 srcpkgs/synapse/files/synapse/log/run
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/synapse/files/synapse/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 1ab3a5a8d54b..b0ed0c0b28b3 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,3 @@
#!/bin/sh
cd /var/lib/synapse
-exec 2>&1
exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
From 56aa3e6067e44dcdc41ac3d51b6156b4bc0264c3 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:48:57 +0100
Subject: [PATCH 2/5] synapse: make service configurable.
That way one can set desired locale and path to config file.
---
srcpkgs/synapse/files/synapse/run | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index b0ed0c0b28b3..0778d6317328 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,3 +1,4 @@
#!/bin/sh
+[ -r ./conf ] && . ./conf
cd /var/lib/synapse
-exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
+exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
From 2c33dfaa1ffdbf9a02878cb015176f9cd8a6279f Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:50:33 +0100
Subject: [PATCH 3/5] synapse: remove unnecessary patches to sample config.
---
srcpkgs/synapse/patches/sample_config.patch | 88 -------------------
.../synapse/patches/sample_log_config.patch | 13 ---
2 files changed, 101 deletions(-)
delete mode 100644 srcpkgs/synapse/patches/sample_config.patch
delete mode 100644 srcpkgs/synapse/patches/sample_log_config.patch
diff --git a/srcpkgs/synapse/patches/sample_config.patch b/srcpkgs/synapse/patches/sample_config.patch
deleted file mode 100644
index 15954e0cd782..000000000000
--- a/srcpkgs/synapse/patches/sample_config.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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.
diff --git a/srcpkgs/synapse/patches/sample_log_config.patch b/srcpkgs/synapse/patches/sample_log_config.patch
deleted file mode 100644
index e4196a446456..000000000000
--- a/srcpkgs/synapse/patches/sample_log_config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml
-index 2485ad25e..71465726b 100644
---- a/docs/sample_log_config.yaml
-+++ b/docs/sample_log_config.yaml
-@@ -19,7 +19,7 @@ handlers:
- file:
- class: logging.handlers.TimedRotatingFileHandler
- formatter: precise
-- filename: /var/log/matrix-synapse/homeserver.log
-+ filename: /var/log/synapse/homeserver.log
- when: midnight
- backupCount: 3 # Does not include the current log file.
- encoding: utf8
From d00679cb7b27216097db73ba91beec609a4ec54d Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:51:01 +0100
Subject: [PATCH 4/5] synapse: create directory for config.
---
srcpkgs/synapse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index abdb2e314e62..fd38593fb22b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -26,6 +26,7 @@ synapse_homedir="/var/lib/synapse"
make_dirs="
/var/lib/synapse 0700 synapse synapse
+ /etc/synapse 755 synapse synapse
/var/log/synapse 0755 synapse synapse"
do_check() {
From 2f2f6eadf6f5ddbd2a3fab5a12442a0333357c62 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Wed, 5 Jan 2022 09:08:48 +0100
Subject: [PATCH 5/5] synapse: revbump for miscellaneous changes.
---
srcpkgs/synapse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index fd38593fb22b..e0e3da99e2ab 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
# Template file for 'synapse'
pkgname=synapse
version=1.49.2
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-frozendict python3-canonicaljson
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (18 preceding siblings ...)
2022-01-05 8:20 ` [PR PATCH] [Updated] " freshprince
@ 2022-01-05 12:18 ` freshprince
2022-01-19 10:45 ` freshprince
2022-01-19 10:45 ` [PR PATCH] [Closed]: " freshprince
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2022-01-05 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
There is an updated pull request by freshprince against master on the void-packages repository
https://github.com/freshprince/void-packages synapse-1.49.2
https://github.com/void-linux/void-packages/pull/34676
synapse: minor changes.
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
~Log to daemon.notice.~ Logging daemon is not really necessary for this.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34676.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-synapse-1.49.2-34676.patch --]
[-- Type: text/x-diff, Size: 8079 bytes --]
From d5eb0cccdd0a829147b505d15be798f279733830 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:45:03 +0100
Subject: [PATCH 1/5] synapse: remove logging process.
By default synapse only logs to stderr when there is a problem with
configuration. For this we don't need a process running that won't do
anything for 99% of the time. Logging to runsvdir should be enough.
---
srcpkgs/synapse/files/synapse/log/run | 1 -
srcpkgs/synapse/files/synapse/run | 1 -
2 files changed, 2 deletions(-)
delete mode 120000 srcpkgs/synapse/files/synapse/log/run
diff --git a/srcpkgs/synapse/files/synapse/log/run b/srcpkgs/synapse/files/synapse/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/synapse/files/synapse/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 1ab3a5a8d54b..b0ed0c0b28b3 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,3 @@
#!/bin/sh
cd /var/lib/synapse
-exec 2>&1
exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
From 56aa3e6067e44dcdc41ac3d51b6156b4bc0264c3 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:48:57 +0100
Subject: [PATCH 2/5] synapse: make service configurable.
That way one can set desired locale and path to config file.
---
srcpkgs/synapse/files/synapse/run | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index b0ed0c0b28b3..0778d6317328 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,3 +1,4 @@
#!/bin/sh
+[ -r ./conf ] && . ./conf
cd /var/lib/synapse
-exec chpst -u synapse:synapse synapse_homeserver -c /etc/synapse/homeserver.yaml
+exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
From 24eb8b4da9d496b42f9abd2d7091d4f51d1fb323 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:50:33 +0100
Subject: [PATCH 3/5] synapse: remove patches to sample config.
---
srcpkgs/synapse/patches/sample_config.patch | 88 -------------------
.../synapse/patches/sample_log_config.patch | 13 ---
2 files changed, 101 deletions(-)
delete mode 100644 srcpkgs/synapse/patches/sample_config.patch
delete mode 100644 srcpkgs/synapse/patches/sample_log_config.patch
diff --git a/srcpkgs/synapse/patches/sample_config.patch b/srcpkgs/synapse/patches/sample_config.patch
deleted file mode 100644
index 15954e0cd782..000000000000
--- a/srcpkgs/synapse/patches/sample_config.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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.
diff --git a/srcpkgs/synapse/patches/sample_log_config.patch b/srcpkgs/synapse/patches/sample_log_config.patch
deleted file mode 100644
index e4196a446456..000000000000
--- a/srcpkgs/synapse/patches/sample_log_config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml
-index 2485ad25e..71465726b 100644
---- a/docs/sample_log_config.yaml
-+++ b/docs/sample_log_config.yaml
-@@ -19,7 +19,7 @@ handlers:
- file:
- class: logging.handlers.TimedRotatingFileHandler
- formatter: precise
-- filename: /var/log/matrix-synapse/homeserver.log
-+ filename: /var/log/synapse/homeserver.log
- when: midnight
- backupCount: 3 # Does not include the current log file.
- encoding: utf8
From 0f4aed2ea527fc073bda8dc1363193cefe1e57b1 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Fri, 31 Dec 2021 09:51:01 +0100
Subject: [PATCH 4/5] synapse: create directory for config.
---
srcpkgs/synapse/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index abdb2e314e62..fd38593fb22b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -26,6 +26,7 @@ synapse_homedir="/var/lib/synapse"
make_dirs="
/var/lib/synapse 0700 synapse synapse
+ /etc/synapse 755 synapse synapse
/var/log/synapse 0755 synapse synapse"
do_check() {
From bcc71989b11be0a9c00dba986478dd589d8046ac Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Wed, 5 Jan 2022 09:08:48 +0100
Subject: [PATCH 5/5] synapse: revbump for miscellaneous changes.
---
srcpkgs/synapse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index fd38593fb22b..e0e3da99e2ab 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
# Template file for 'synapse'
pkgname=synapse
version=1.49.2
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-frozendict python3-canonicaljson
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (19 preceding siblings ...)
2022-01-05 12:18 ` freshprince
@ 2022-01-19 10:45 ` freshprince
2022-01-19 10:45 ` [PR PATCH] [Closed]: " freshprince
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2022-01-19 10:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by freshprince on void-packages repository
https://github.com/void-linux/void-packages/pull/34676#issuecomment-1016309775
Comment:
Superseded by #35109.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Closed]: synapse: minor changes.
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
` (20 preceding siblings ...)
2022-01-19 10:45 ` freshprince
@ 2022-01-19 10:45 ` freshprince
21 siblings, 0 replies; 23+ messages in thread
From: freshprince @ 2022-01-19 10:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]
There's a closed pull request on the void-packages repository
synapse: minor changes.
https://github.com/void-linux/void-packages/pull/34676
Description:
Don't patch sample config.
Make run script configurable so that admin can change path to config file and set locale if necessary.
Create /etc/synapse again.
~Log to daemon.notice.~ Logging daemon is not really necessary for this.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2022-01-19 10:45 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-23 7:53 [PR PATCH] synapse: update to 1.49.2 freshprince
2021-12-23 8:01 ` [PR PATCH] [Updated] " freshprince
2021-12-30 2:57 ` TinfoilSubmarine
2021-12-30 2:59 ` TinfoilSubmarine
2021-12-30 3:11 ` TinfoilSubmarine
2021-12-30 10:44 ` freshprince
2021-12-30 10:54 ` freshprince
2021-12-30 14:49 ` TinfoilSubmarine
2021-12-31 8:51 ` [PR PATCH] [Updated] " freshprince
2021-12-31 8:53 ` freshprince
2021-12-31 9:02 ` freshprince
2021-12-31 9:11 ` [PR PATCH] [Updated] synapse: minor changes freshprince
2021-12-31 17:09 ` TinfoilSubmarine
2022-01-03 8:55 ` freshprince
2022-01-03 16:03 ` TinfoilSubmarine
2022-01-03 16:20 ` freshprince
2022-01-03 17:44 ` TinfoilSubmarine
2022-01-03 17:44 ` TinfoilSubmarine
2022-01-05 0:58 ` TinfoilSubmarine
2022-01-05 8:20 ` [PR PATCH] [Updated] " freshprince
2022-01-05 12:18 ` freshprince
2022-01-19 10:45 ` freshprince
2022-01-19 10:45 ` [PR PATCH] [Closed]: " freshprince
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).