Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Minor cleanup to Debian packaging #11269

Merged
merged 5 commits into from
Nov 7, 2021
Merged

Minor cleanup to Debian packaging #11269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc7f50c
Remove unused Vagrant scripts
callahad Nov 7, 2021
13f43fe
Change package Architecture to any
callahad Nov 7, 2021
51a7c9e
Preinstall the wheel package when building venvs.
callahad Nov 7, 2021
b8d2373
Allow /etc/default/matrix-synapse to be missing
callahad Nov 7, 2021
64aa44d
Newsfragment
callahad Nov 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/11269.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Clean up trivial aspects of the Debian package build tooling.
1 change: 1 addition & 0 deletions debian/build_virtualenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dh_virtualenv \
--upgrade-pip \
--preinstall="lxml" \
--preinstall="mock" \
--preinstall="wheel" \
callahad marked this conversation as resolved.
Show resolved Hide resolved
--extra-pip-arg="--no-cache-dir" \
--extra-pip-arg="--compile" \
--extras="all,systemd,test"
Expand Down
4 changes: 4 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
matrix-synapse-py3 (1.47.0+nmu1) UNRELEASED; urgency=medium

* Update scripts to pass Shellcheck lints.
* Remove unused Vagrant scripts from debian/ directory.
callahad marked this conversation as resolved.
Show resolved Hide resolved
* Change package Architecture to any.
callahad marked this conversation as resolved.
Show resolved Hide resolved
* Preinstall the "wheel" package when building virtualenvs.
* Do not error if /etc/default/matrix-synapse is missing.

-- root <root@cae79a6e79d7> Fri, 22 Oct 2021 22:20:31 +0000
callahad marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Standards-Version: 3.9.8
Homepage: https://github.com/matrix-org/synapse

Package: matrix-synapse-py3
Architecture: amd64
Architecture: any
Provides: matrix-synapse
Conflicts:
matrix-synapse (<< 0.34.0.1-0matrix2),
Expand Down
2 changes: 1 addition & 1 deletion debian/matrix-synapse.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Description=Synapse Matrix homeserver
Type=notify
User=matrix-synapse
WorkingDirectory=/var/lib/matrix-synapse
EnvironmentFile=/etc/default/matrix-synapse
EnvironmentFile=-/etc/default/matrix-synapse
ExecStartPre=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/ --generate-keys
ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/
ExecReload=/bin/kill -HUP $MAINPID
Expand Down
2 changes: 0 additions & 2 deletions debian/test/.gitignore
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions debian/test/provision.sh
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions debian/test/stretch/Vagrantfile
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions debian/test/xenial/Vagrantfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docs/systemd-with-workers/system/matrix-synapse-worker@.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Type=notify
NotifyAccess=main
User=matrix-synapse
WorkingDirectory=/var/lib/matrix-synapse
EnvironmentFile=/etc/default/matrix-synapse
EnvironmentFile=-/etc/default/matrix-synapse
ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.generic_worker --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/ --config-path=/etc/matrix-synapse/workers/%i.yaml
ExecReload=/bin/kill -HUP $MAINPID
Restart=always
Expand Down
2 changes: 1 addition & 1 deletion docs/systemd-with-workers/system/matrix-synapse.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Type=notify
NotifyAccess=main
User=matrix-synapse
WorkingDirectory=/var/lib/matrix-synapse
EnvironmentFile=/etc/default/matrix-synapse
EnvironmentFile=-/etc/default/matrix-synapse
ExecStartPre=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/ --generate-keys
ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/
ExecReload=/bin/kill -HUP $MAINPID
Expand Down