Date: Sunday, May 23, 2021 @ 22:20:07
Author: demize
Revision: 943525
archrelease: copy trunk to community-any
Added:
matrix-synapse/repos/community-any/PKGBUILD
(from rev 943524, matrix-synapse/trunk/PKGBUILD)
matrix-synapse/repos/community-any/generic_worker.yaml.example
(from rev 943524, matrix-synapse/trunk/generic_worker.yaml.example)
matrix-synapse/repos/community-any/synapse-worker@.service
(from rev 943524, matrix-synapse/trunk/synapse-worker@.service)
matrix-synapse/repos/community-any/synapse.install
(from rev 943524, matrix-synapse/trunk/synapse.install)
matrix-synapse/repos/community-any/synapse.service
(from rev 943524, matrix-synapse/trunk/synapse.service)
matrix-synapse/repos/community-any/synapse.target
(from rev 943524, matrix-synapse/trunk/synapse.target)
matrix-synapse/repos/community-any/sysusers-synapse.conf
(from rev 943524, matrix-synapse/trunk/sysusers-synapse.conf)
matrix-synapse/repos/community-any/tmpfiles-synapse.conf
(from rev 943524, matrix-synapse/trunk/tmpfiles-synapse.conf)
Deleted:
matrix-synapse/repos/community-any/PKGBUILD
matrix-synapse/repos/community-any/synapse.install
matrix-synapse/repos/community-any/synapse.service
matrix-synapse/repos/community-any/sysusers-synapse.conf
matrix-synapse/repos/community-any/tmpfiles-synapse.conf
-----------------------------+
PKGBUILD | 146 +++++++++++++++++++++---------------------
generic_worker.yaml.example | 34 +++++++++
synapse-worker@.service | 22 ++++++
synapse.install | 94 +++++++++++++--------------
synapse.service | 41 ++++++-----
synapse.target | 7 ++
sysusers-synapse.conf | 2
tmpfiles-synapse.conf | 2
8 files changed, 211 insertions(+), 137 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-23 22:19:57 UTC (rev 943524)
+++ PKGBUILD 2021-05-23 22:20:07 UTC (rev 943525)
@@ -1,70 +0,0 @@
-# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
-# Contributor: Ivan Shapovalov <inte...@intelfx.name>
-
-pkgname=matrix-synapse
-pkgver=1.33.2
-pkgrel=1
-
-pkgdesc="Matrix reference homeserver"
-url="https://github.com/matrix-org/synapse";
-arch=('any')
-license=('Apache')
-
-depends=('libwebp' 'python-jsonschema' 'python-twisted'
- 'python-pyopenssl' 'python-yaml' 'python-pyasn1' 'python-pynacl'
- 'python-bcrypt' 'python-frozendict'
- 'python-pillow' 'python-ujson'
- 'python-pysaml2' 'python-setuptools'
- 'python-systemd' 'python-unpaddedbase64' 'python-canonicaljson'
- 'python-signedjson' 'python-pymacaroons'
- 'python-service-identity' 'python-msgpack'
- 'python-phonenumbers' 'python-prometheus_client'
- 'python-attrs' 'python-netaddr' 'python-sortedcontainers'
- 'python-treq' 'python-idna' 'python-jinja'
- 'python-bleach' 'python-typing_extensions' 'systemd')
-checkdepends=('python-authlib' 'python-pyjwt' 'python-lxml'
'python-parameterized'
- 'python-txredisapi' 'python-hiredis')
-optdepends=('perl: sync_room_to_group.pl'
- 'python-psycopg2: PostgreSQL support'
- 'python-lxml: URL previewing'
- 'python-psutil: metrics'
- 'python-pyjwt: jwt'
- 'python-txredisapi: redis'
- 'python-hiredis')
-
-source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz";
- 'synapse.service'
- 'sysusers-synapse.conf'
- 'tmpfiles-synapse.conf')
-
-sha256sums=('5e0a934dba5994ec102e94ba323e88746b9aec6ccaae03ba2c94780a6dbfeb97'
- 'ce434eaa92e6504988fb9005d49c078ab7a2d33951d8adece26ccce8b2475857'
- 'aadfdd78fe73e6eb325ee4299b8db8b97bfa2f4e7df953aa8477f442598a7ec5'
- '65588c8c64dfb84cab831cd8d028a295d753cf7322dd63053e8488466047b45f')
-
-backup=('etc/synapse/log_config.yaml')
-install=synapse.install
-
-build() {
- cd synapse-$pkgver
- python setup.py build
-}
-
-check() {
- cd synapse-$pkgver
- PYTHONPATH=. trial tests
-}
-
-package() {
- install -Dm644 synapse.service
"$pkgdir"/usr/lib/systemd/system/synapse.service
-
- cd synapse-$pkgver
- export PYTHONHASHSEED=0
- python setup.py install --root "$pkgdir" --optimize=1 --skip-build
-
- install -dm755 -o 198 -g 198 "$pkgdir"/etc/synapse
-
- install -Dm644 contrib/systemd/log_config.yaml
"$pkgdir"/etc/synapse/log_config.yaml
- install -Dm644 "$srcdir"/sysusers-synapse.conf
"$pkgdir"/usr/lib/sysusers.d/synapse.conf
- install -Dm644 "$srcdir"/tmpfiles-synapse.conf
"$pkgdir"/usr/lib/tmpfiles.d/synapse.conf
-}
Copied: matrix-synapse/repos/community-any/PKGBUILD (from rev 943524,
matrix-synapse/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-23 22:20:07 UTC (rev 943525)
@@ -0,0 +1,76 @@
+# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
+# Contributor: Ivan Shapovalov <inte...@intelfx.name>
+
+pkgname=matrix-synapse
+pkgver=1.34.0
+pkgrel=3
+
+pkgdesc="Matrix reference homeserver"
+url="https://github.com/matrix-org/synapse";
+arch=('any')
+license=('Apache')
+
+depends=('libwebp' 'python-jsonschema' 'python-twisted'
+ 'python-pyopenssl' 'python-yaml' 'python-pyasn1' 'python-pynacl'
+ 'python-bcrypt' 'python-frozendict'
+ 'python-pillow' 'python-ujson'
+ 'python-pysaml2' 'python-setuptools'
+ 'python-systemd' 'python-unpaddedbase64' 'python-canonicaljson'
+ 'python-signedjson' 'python-pymacaroons'
+ 'python-service-identity' 'python-msgpack'
+ 'python-phonenumbers' 'python-prometheus_client'
+ 'python-attrs' 'python-netaddr' 'python-sortedcontainers'
+ 'python-treq' 'python-idna' 'python-jinja'
+ 'python-bleach' 'python-typing_extensions' 'systemd')
+checkdepends=('python-authlib' 'python-pyjwt' 'python-lxml'
'python-parameterized'
+ 'python-txredisapi' 'python-hiredis')
+optdepends=('perl: sync_room_to_group.pl'
+ 'python-psycopg2: PostgreSQL support'
+ 'python-lxml: URL previewing'
+ 'python-psutil: metrics'
+ 'python-pyjwt: jwt'
+ 'python-txredisapi: redis'
+ 'python-hiredis')
+
+source=("synapse-$pkgver.tar.gz::https://github.com/matrix-org/synapse/archive/v$pkgver.tar.gz";
+ 'generic_worker.yaml.example'
+ 'synapse.service'
+ 'synapse.target'
+ 'synapse-worker@.service'
+ 'sysusers-synapse.conf'
+ 'tmpfiles-synapse.conf')
+
+sha256sums=('d74654ca8859dc4d0794dd46663d2f88d5bd36b38fd48a820e235ab50cc8a726'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
+
+backup=('etc/synapse/log_config.yaml')
+install=synapse.install
+
+build() {
+ cd synapse-$pkgver
+ python setup.py build
+}
+
+check() {
+ cd synapse-$pkgver
+ PYTHONPATH=. trial tests
+}
+
+package() {
+ cd synapse-$pkgver
+ export PYTHONHASHSEED=0
+ python setup.py install --root "$pkgdir" --optimize=1 --skip-build
+
+ install -dm755 -o 198 -g 198 "$pkgdir"/etc/synapse
+ install -Dm644 contrib/systemd/log_config.yaml
"$pkgdir"/etc/synapse/log_config.yaml
+ install -Dm644 "$srcdir"/generic_worker.yaml.example
"$pkgdir"/etc/synapse/workers/generic_worker.yaml.example
+
+ install -Dm644 -t "$pkgdir"/usr/lib/systemd/system/
"$srcdir"/synapse{,-worker@}.service "$srcdir"/synapse.target
+ install -Dm644 "$srcdir"/sysusers-synapse.conf
"$pkgdir"/usr/lib/sysusers.d/synapse.conf
+ install -Dm644 "$srcdir"/tmpfiles-synapse.conf
"$pkgdir"/usr/lib/tmpfiles.d/synapse.conf
+}
Copied: matrix-synapse/repos/community-any/generic_worker.yaml.example (from
rev 943524, matrix-synapse/trunk/generic_worker.yaml.example)
===================================================================
--- generic_worker.yaml.example (rev 0)
+++ generic_worker.yaml.example 2021-05-23 22:20:07 UTC (rev 943525)
@@ -0,0 +1,34 @@
+# To configure workers please refer to:
+# https://github.com/matrix-org/synapse/blob/master/docs/workers.md
+
+# The type of the worker. A generic_worker can handle a part of the
+# client/federation API requests, taking some load from the master
+# process.
+# If used, the reverse proxy has to be configured accordingly.
+worker_app: synapse.app.generic_worker
+
+# The name of the worker. Must be unique among all workers.
+worker_name: worker1
+
+# The replication listener on the main synapse process.
+worker_replication_host: '127.0.0.1'
+worker_replication_http_port: 9093
+
+
+worker_listeners:
+ - type: http
+ bind_address: '127.0.0.1'
+ port: 8083
+
+# Uncomment the following to make this worker respect the
+# X-Forwarded-For header set by your reverse proxy.
+# x_forwarded: true
+
+# Because a generic_worker handles client and federation API requests
+# it needs the client and federation resources.
+ resources:
+ - names:
+ - client
+ - federation
+
+worker_log_config: /etc/synapse/log_config.yaml
Copied: matrix-synapse/repos/community-any/synapse-worker@.service (from rev
943524, matrix-synapse/trunk/synapse-worker@.service)
===================================================================
--- synapse-worker@.service (rev 0)
+++ synapse-worker@.service 2021-05-23 22:20:07 UTC (rev 943525)
@@ -0,0 +1,22 @@
+[Unit]
+Description=Synapse Matrix homeserver (%i)
+AssertPathExists=/etc/synapse/workers/%i.yaml
+PartOf=synapse.target
+ReloadPropagatedFrom=synapse.target
+After=synapse.service
+
+[Service]
+Type=notify
+User=synapse
+Group=synapse
+SyslogIdentifier=synapse-%i
+Environment=LANG=en_US.UTF-8
+WorkingDirectory=/var/lib/synapse
+ExecStart=/usr/bin/python3 -m synapse.app.generic_worker
--config-path=/etc/synapse/homeserver.yaml
--config-path=/etc/synapse/workers/%i.yaml
+ExecReload=/bin/kill -HUP $MAINPID
+EnvironmentFile=-/etc/default/synapse
+Restart=always
+RestartSec=3
+
+[Install]
+WantedBy=synapse.target
Deleted: synapse.install
===================================================================
--- synapse.install 2021-05-23 22:19:57 UTC (rev 943524)
+++ synapse.install 2021-05-23 22:20:07 UTC (rev 943525)
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# arg 1: the new package version
-post_install() {
- if [[ ! -e /etc/synapse/homeserver.yaml ]]; then
- cat <<-EOF
- ==> A synapse configuration file needs to be generated before
you can
- start synapse, and you should make sure that it's readable
by the
- synapse user.
-
- cd /var/lib/synapse
- sudo -u synapse python -m synapse.app.homeserver \\
- --server-name my.domain.name \\
- --config-path /etc/synapse/homeserver.yaml \\
- --generate-config \\
- --report-stats=yes
-
- N.B.: The default synapse config enables the webclient
feature.
- You need to either disable it, install the syweb
python package
- from matrix-angular-sdk, or set 'web_client_location'
to a path
- to make synapse not try to serve it using syweb.
- EOF
- install -dm700 -o 198 -g 198 /var/lib/synapse
- fi
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- if [[ "$(vercmp "$2" 1.4.0-2)" -lt 0 ]]; then
- cat <<-EOF
- ==> Upstream email templates are no longer available in
/var/lib/synapse/res/templates.
-
- If you want to customize the templates, you can copy the
default ones from
- /usr/lib/python3.x/site-packages/synapse/res/templates/
- EOF
- fi
-
- if [[ "$(vercmp "$2" 1.26.0-1)" -lt 0 ]]; then
- cat <<-EOF
- ==> Synapse 1.26.0 includes a new database schema version.
-
- If you need to downgrade, see the following document:
-
https://github.com/matrix-org/synapse/blob/v1.26.0/UPGRADE.rst#upgrading-to-v1260
- EOF
- fi
-}
Copied: matrix-synapse/repos/community-any/synapse.install (from rev 943524,
matrix-synapse/trunk/synapse.install)
===================================================================
--- synapse.install (rev 0)
+++ synapse.install 2021-05-23 22:20:07 UTC (rev 943525)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# arg 1: the new package version
+post_install() {
+ if [[ ! -e /etc/synapse/homeserver.yaml ]]; then
+ cat <<-EOF
+ ==> A synapse configuration file needs to be generated before
you can
+ start synapse, and you should make sure that it's readable
by the
+ synapse user.
+
+ cd /var/lib/synapse
+ sudo -u synapse python -m synapse.app.homeserver \\
+ --server-name my.domain.name \\
+ --config-path /etc/synapse/homeserver.yaml \\
+ --generate-config \\
+ --report-stats=yes
+
+ N.B.: The default synapse config enables the webclient
feature.
+ You need to either disable it, install the syweb
python package
+ from matrix-angular-sdk, or set 'web_client_location'
to a path
+ to make synapse not try to serve it using syweb.
+ EOF
+ install -dm700 -o 198 -g 198 /var/lib/synapse
+ fi
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [[ "$(vercmp "$2" 1.4.0-2)" -lt 0 ]]; then
+ cat <<-EOF
+ ==> Upstream email templates are no longer available in
/var/lib/synapse/res/templates.
+
+ If you want to customize the templates, you can copy the
default ones from
+ /usr/lib/python3.x/site-packages/synapse/res/templates/
+ EOF
+ fi
+
+ if [[ "$(vercmp "$2" 1.26.0-1)" -lt 0 ]]; then
+ cat <<-EOF
+ ==> Synapse 1.26.0 includes a new database schema version.
+
+ If you need to downgrade, see the following document:
+
https://github.com/matrix-org/synapse/blob/v1.26.0/UPGRADE.rst#upgrading-to-v1260
+ EOF
+ fi
+}
Deleted: synapse.service
===================================================================
--- synapse.service 2021-05-23 22:19:57 UTC (rev 943524)
+++ synapse.service 2021-05-23 22:20:07 UTC (rev 943525)
@@ -1,18 +0,0 @@
-[Unit]
-Description=Synapse Matrix homeserver
-After=network-online.target
-Requires=network-online.target
-
-[Service]
-Type=simple
-User=synapse
-Group=synapse
-SyslogIdentifier=synapse
-Environment=LANG=en_US.UTF-8
-WorkingDirectory=/var/lib/synapse
-ExecStart=/usr/bin/python3 -m synapse.app.homeserver
--config-path=/etc/synapse/homeserver.yaml
-ExecStop=/usr/bin/synctl stop /etc/synapse/homeserver.yaml
-EnvironmentFile=-/etc/default/synapse
-
-[Install]
-WantedBy=multi-user.target
Copied: matrix-synapse/repos/community-any/synapse.service (from rev 943524,
matrix-synapse/trunk/synapse.service)
===================================================================
--- synapse.service (rev 0)
+++ synapse.service 2021-05-23 22:20:07 UTC (rev 943525)
@@ -0,0 +1,23 @@
+[Unit]
+Description=Synapse Matrix homeserver (master)
+After=network-online.target
+Wants=network-online.target
+PartOf=synapse.target
+ReloadPropagatedFrom=synapse.target
+
+[Service]
+Type=notify
+User=synapse
+Group=synapse
+SyslogIdentifier=synapse
+Environment=LANG=en_US.UTF-8
+WorkingDirectory=/var/lib/synapse
+ExecStart=/usr/bin/python3 -m synapse.app.homeserver
--config-path=/etc/synapse/homeserver.yaml
+ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecStop=/usr/bin/synctl stop /etc/synapse/homeserver.yaml
+EnvironmentFile=-/etc/default/synapse
+Restart=always
+RestartSec=3
+
+[Install]
+WantedBy=multi-user.target synapse.target
Copied: matrix-synapse/repos/community-any/synapse.target (from rev 943524,
matrix-synapse/trunk/synapse.target)
===================================================================
--- synapse.target (rev 0)
+++ synapse.target 2021-05-23 22:20:07 UTC (rev 943525)
@@ -0,0 +1,7 @@
+[Unit]
+Description=Synapse parent target
+After=network-online.target
+Wants=network-online.target
+
+[Install]
+WantedBy=multi-user.target
Deleted: sysusers-synapse.conf
===================================================================
--- sysusers-synapse.conf 2021-05-23 22:19:57 UTC (rev 943524)
+++ sysusers-synapse.conf 2021-05-23 22:20:07 UTC (rev 943525)
@@ -1 +0,0 @@
-u synapse 198 "Matrix Synapse user" /var/lib/synapse
Copied: matrix-synapse/repos/community-any/sysusers-synapse.conf (from rev
943524, matrix-synapse/trunk/sysusers-synapse.conf)
===================================================================
--- sysusers-synapse.conf (rev 0)
+++ sysusers-synapse.conf 2021-05-23 22:20:07 UTC (rev 943525)
@@ -0,0 +1 @@
+u synapse 198 "Matrix Synapse user" /var/lib/synapse
Deleted: tmpfiles-synapse.conf
===================================================================
--- tmpfiles-synapse.conf 2021-05-23 22:19:57 UTC (rev 943524)
+++ tmpfiles-synapse.conf 2021-05-23 22:20:07 UTC (rev 943525)
@@ -1 +0,0 @@
-d /var/lib/synapse 0700 synapse synapse -
Copied: matrix-synapse/repos/community-any/tmpfiles-synapse.conf (from rev
943524, matrix-synapse/trunk/tmpfiles-synapse.conf)
===================================================================
--- tmpfiles-synapse.conf (rev 0)
+++ tmpfiles-synapse.conf 2021-05-23 22:20:07 UTC (rev 943525)
@@ -0,0 +1 @@
+d /var/lib/synapse 0700 synapse synapse -
