Accepting request 1120484 from server:proxy
- Fix boo#1216372 and boo#1216373, run systemd service as a dedicated user and group OBS-URL: https://build.opensuse.org/request/show/1120484 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shadowsocks-rust?expand=0&rev=4
This commit is contained in:
commit
70aa2a0e41
@ -21,6 +21,8 @@ Type=forking
|
|||||||
PIDFile=/var/run/shadowsocks-rust-client.pid
|
PIDFile=/var/run/shadowsocks-rust-client.pid
|
||||||
ExecStart=/usr/bin/sslocal --log-without-time -c /etc/shadowsocks/shadowsocks-rust.json --tcp-fast-open
|
ExecStart=/usr/bin/sslocal --log-without-time -c /etc/shadowsocks/shadowsocks-rust.json --tcp-fast-open
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
|
User=shadowsocks
|
||||||
|
Group=shadowsocks
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -21,6 +21,8 @@ Type=forking
|
|||||||
PIDFile=/var/run/shadowsocks-rust-manager.pid
|
PIDFile=/var/run/shadowsocks-rust-manager.pid
|
||||||
ExecStart=/usr/bin/ssmanager --log-without-time -c /etc/shadowsocks/shadowsocks-rust.json --tcp-fast-open
|
ExecStart=/usr/bin/ssmanager --log-without-time -c /etc/shadowsocks/shadowsocks-rust.json --tcp-fast-open
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
|
User=shadowsocks
|
||||||
|
Group=shadowsocks
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -21,6 +21,8 @@ Type=forking
|
|||||||
PIDFile=/var/run/shadowsocks-rust-server.pid
|
PIDFile=/var/run/shadowsocks-rust-server.pid
|
||||||
ExecStart=/usr/bin/ssserver --log-without-time -c /etc/shadowsocks/shadowsocks-rust.json --tcp-fast-open
|
ExecStart=/usr/bin/ssserver --log-without-time -c /etc/shadowsocks/shadowsocks-rust.json --tcp-fast-open
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
|
User=shadowsocks
|
||||||
|
Group=shadowsocks
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 24 14:38:46 UTC 2023 - Hillwood Yang <hillwood@opensuse.org>
|
||||||
|
|
||||||
|
- Fix boo#1216372 and boo#1216373, run systemd service as a dedicated user and group
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Sep 25 14:02:49 UTC 2023 - Hillwood Yang <hillwood@opensuse.org>
|
Mon Sep 25 14:02:49 UTC 2023 - Hillwood Yang <hillwood@opensuse.org>
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ BuildRequires: cargo
|
|||||||
BuildRequires: cargo-packaging
|
BuildRequires: cargo-packaging
|
||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: pkgconfig(openssl)
|
BuildRequires: pkgconfig(openssl)
|
||||||
|
Requires(pre): shadow
|
||||||
Recommends: shadowsocks-v2ray-plugin
|
Recommends: shadowsocks-v2ray-plugin
|
||||||
# ExcludeArch: ppc ppc64 ppc64le s390 s390x
|
# ExcludeArch: ppc ppc64 ppc64le s390 s390x
|
||||||
%{?systemd_ordering}
|
%{?systemd_ordering}
|
||||||
@ -76,11 +77,16 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-manager
|
|||||||
%service_add_pre %{name}-client.service
|
%service_add_pre %{name}-client.service
|
||||||
%service_add_pre %{name}-server.service
|
%service_add_pre %{name}-server.service
|
||||||
%service_add_pre %{name}-manager.service
|
%service_add_pre %{name}-manager.service
|
||||||
|
getent group shadowsocks >/dev/null || %{_sbindir}/groupadd --system shadowsocks
|
||||||
|
getent passwd shadowsocks >/dev/null || %{_sbindir}/useradd --system -c "shadowsocks User" \
|
||||||
|
-d %{_localstatedir}/shadowsocks -m -g shadowsocks -s %{_sbindir}/nologin \
|
||||||
|
shadowsocks
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%service_add_post %{name}-client.service
|
%service_add_post %{name}-client.service
|
||||||
%service_add_post %{name}-server.service
|
%service_add_post %{name}-server.service
|
||||||
%service_add_post %{name}-manager.service
|
%service_add_post %{name}-manager.service
|
||||||
|
chown root:shadowsocks %{_sysconfdir}/shadowsocks -R
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%service_del_preun %{name}-client.service
|
%service_del_preun %{name}-client.service
|
||||||
@ -99,6 +105,7 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-manager
|
|||||||
%{_sbindir}/rc%{name}-*
|
%{_sbindir}/rc%{name}-*
|
||||||
%{_unitdir}/%{name}-*.service
|
%{_unitdir}/%{name}-*.service
|
||||||
%dir %{_sysconfdir}/shadowsocks
|
%dir %{_sysconfdir}/shadowsocks
|
||||||
|
# %config(noreplace) %attr(660,%{name},root) %{_sysconfdir}/shadowsocks
|
||||||
%config %{_sysconfdir}/shadowsocks/%{name}.json
|
%config %{_sysconfdir}/shadowsocks/%{name}.json
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user