diff --git a/matrix-synapse.spec b/matrix-synapse.spec index bfbd1af..4ce8467 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -2,7 +2,7 @@ # Version suffix in URL when building release candidates %global rcx %{nil} -%global ghversion 1.49.0 +%global ghversion 1.49.2 %{?python_enable_dependency_generator} @@ -21,7 +21,6 @@ URL: https://github.com/matrix-org/%{srcname} Source0: %{url}/archive/v%{ghversion}%{rcx}/%{srcname}-%{ghversion}%{rcx}.tar.gz Source1: synapse.sysconfig Source2: synapse.service -Source3: synapse-homeserver Source4: synapse@.service # non-upstreamable patch to accept any version of python-cryptography, see RHBZ#1978949 @@ -115,8 +114,6 @@ install -p -D -T -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/synapse.service install -p -D -T -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/synapse@.service install -p -d -m 755 %{buildroot}/%{_sharedstatedir}/synapse -install -p -D -T -m 755 %{SOURCE3} %{buildroot}%{_bindir}/synapse-homeserver - %check PYTHONPATH=. trial-3 tests diff --git a/synapse-homeserver b/synapse-homeserver deleted file mode 100755 index 8cc0260..0000000 --- a/synapse-homeserver +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/python3 -import re -import sys - -from synapse.app.homeserver import main - -if __name__ == "__main__": - sys.argv[0] = re.sub(r"(-script\.pyw?|\.exe)?$", "", sys.argv[0]) - sys.exit(main()) diff --git a/synapse.service b/synapse.service index 605044f..567aa98 100644 --- a/synapse.service +++ b/synapse.service @@ -8,7 +8,7 @@ NotifyAccess=main User=synapse Group=synapse WorkingDirectory=/var/lib/synapse -ExecStart=/usr/bin/synapse-homeserver --config-path=/etc/synapse/homeserver.yaml +ExecStart=/usr/bin/synapse_homeserver --config-path=/etc/synapse/homeserver.yaml ExecReload=/bin/kill -HUP $MAINPID # EnvironmentFile=-/etc/sysconfig/synapse # Can be used to e.g. set SYNAPSE_CACHE_FACTOR SyslogIdentifier=synapse diff --git a/synapse@.service b/synapse@.service index 4439cbd..0050ea2 100644 --- a/synapse@.service +++ b/synapse@.service @@ -15,7 +15,7 @@ Type=notify NotifyAccess=main User=synapse WorkingDirectory=/var/lib/synapse -ExecStart=/usr/bin/python -m synapse.app.generic_worker --config-path=/etc/synapse/homeserver.yaml --config-path=/etc/synapse/workers/%i.yaml +ExecStart=/usr/bin/synapse_worker --config-path=/etc/synapse/homeserver.yaml --config-path=/etc/synapse/workers/%i.yaml ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure RestartSec=3