rpm/syncthing
SHA256
1
0
Fork 0
forked from pool/syncthing
Code Pull Requests Activity

Accepting request 896096 from home:fniepelt

Browse Source 
The unit file for the strelaysrv references "syncthing-relaysrv" at a few points which makes the service not possible to start because opensuse uses "strelaysrv" for the user and group name and paths. This change adjusts the EnvironmentFile, User, Group and ReadWritePaths option in the unit file for the strelaysrv.

OBS-URL: https://build.opensuse.org/request/show/896096
OBS-URL: https://build.opensuse.org/package/show/network/syncthing?expand=0&rev=216
This commit is contained in:
Marius Kittler 2021-05-29 15:57:46 +00:00 committed by Git OBS Bridge
parent 2c03447f1d
commit eb8d71641f
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
syncthing.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat May 29 12:40:56 UTC 2021 - Fabian Niepelt <fniepelt@takios.de>
- Fix User, Group, EnvironmentFile and ReadWritePaths in systemd.service unit
-------------------------------------------------------------------
Fri May 14 08:02:12 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>

8
syncthing.spec
View File

@ -81,6 +81,14 @@ sed -i '/Service\]/a EnvironmentFile=-\/etc\/default/strelaysrv' \
%{buildroot}%{_unitdir}/strelaysrv.service
sed -i 's,^ExecStart=.*,ExecStart=/usr/bin/strelaysrv $OPTIONS,' \
%{buildroot}%{_unitdir}/strelaysrv.service
sed -i 's,EnvironmentFile=/etc/default/syncthing-relaysrv,EnvironmentFile=-/etc/default/syncthing-relaysrv,' \
%{buildroot}%{_unitdir}/strelaysrv.service
sed -i 's/^User=.*/User=strelaysrv/' \
%{buildroot}%{_unitdir}/strelaysrv.service
sed -i 's/^Group=.*/Group=strelaysrv/' \
%{buildroot}%{_unitdir}/strelaysrv.service
sed -i 's,^ReadWritePaths=.*,ReadWritePaths=/var/lib/strelaysrv,' \
%{buildroot}%{_unitdir}/strelaysrv.service
install -Dpm 0644 etc/linux-systemd/system/%{name}@.service \
%{buildroot}%{_unitdir}/%{name}@.service
install -Dpm 0644 etc/linux-systemd/system/%{name}-resume.service \