[Packaging] Move user out of systemd files and add to tarball

With the `deluge` user specified in the unit files it ties it to
that user and makes it unavailable for re-use by systemd user instance.

Remove the user and group from the unit files and put them in a separate
`user.conf` file that should be installed as an override file e.g. for
deluged.service this would be placed as follows:

    /etc/systemd/service/deluge.service.d/user.conf

Add the systemd files to the tarball for package maintainers.

Closes: #2034
This commit is contained in:
Calum Lind 2019-06-08 19:31:30 +01:00
parent 879a397215
commit 212efc4f52
5 changed files with 9 additions and 5 deletions

View File

@ -2,6 +2,10 @@
## 2.0.2 (WiP)
### Packaging
- Add systemd deluged and deluge-web service files to package tarball (#2034)
### Core
- Fix Python 2 compatiblity issue with SimpleNamespace.

View File

@ -8,6 +8,7 @@ include version.py
include gen_web_gettext.py
graft docs/man
graft packaging/systemd
include deluge/i18n/*.po
recursive-exclude deluge/i18n *.mo

View File

@ -6,9 +6,6 @@ Wants=deluged.service
[Service]
Type=simple
User=deluge
Group=deluge
UMask=027
ExecStart=/usr/bin/deluge-web -d

View File

@ -5,8 +5,6 @@ After=network-online.target
[Service]
Type=simple
User=deluge
Group=deluge
UMask=007
ExecStart=/usr/bin/deluged -d

View File

@ -0,0 +1,4 @@
# Override service user
[Service]
User=deluge
Group=deluge