Silique/speedtest-rs-rpm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use /usr/lib instead of /var/lib

Browse source
This commit is contained in:
Emmanuel Garette 2022-10-16 14:33:30 +02:00
parent a9c32cdb2b
commit d57b5207c4
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
speedtest-rs.service
View file

@ -6,9 +6,9 @@ After=network.target
[Service] [Service]
User=speedtest User=speedtest
Group=speedtest Group=speedtest
Environment=LATITUDE=0.0 LONGITUDE=0.0 SPEEDTEST_DIR=/var/lib/speedtest-rs SPEEDTEST_PORT=80 Environment=SPEEDTEST_LATITUDE=0.0 SPEEDTEST_LONGITUDE=0.0 SPEEDTEST_ADDRESS=127.0.0.1 SPEEDTEST_DIR=/usr/lib/speedtest-rs SPEEDTEST_PORT=8000
EnvironmentFile=-/etc/speedtest-rs/config.sh EnvironmentFile=-/etc/speedtest-rs/config.env
ExecStart=/usr/bin/speedtest-rs --ip=0.0.0.0 --port=${SPEEDTEST_PORT} --assets=${SPEEDTEST_DIR} --ipinfo_token=${IPINFO_TOKEN} --latitude=${LATITUDE} --longitude=${LONGITUDE} --cert=${SPEEDTEST_CERT} --key=${SPEEDTEST_KEY} --ca_cert=${SPEEDTEST_CA_CERT} ExecStart=/usr/bin/speedtest-rs --ip=${SPEEDTEST_ADDRESS} --port=${SPEEDTEST_PORT} --assets=${SPEEDTEST_DIR} --ipinfo_token=${IPINFO_TOKEN} --latitude=${SPEEDTEST_LATITUDE} --longitude=${SPEEDTEST_LONGITUDE} --cert=${SPEEDTEST_CERT} --key=${SPEEDTEST_KEY} --ca_cert=${SPEEDTEST_CA_CERT}
PrivateTmp=true PrivateTmp=true
PrivateDevices=true PrivateDevices=true
ProtectHome=true ProtectHome=true

10
speedtest-rs.spec
View file

@ -10,6 +10,7 @@ URL: %{repo}
Source0: %{repo}/archive/%{version}.tar.gz Source0: %{repo}/archive/%{version}.tar.gz
Source1: speedtest-rs.service Source1: speedtest-rs.service
Source2: speedtest-rs.sysusers Source2: speedtest-rs.sysusers
Source3: config.env
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
@ -26,10 +27,11 @@ cargo build --release
%install %install
install -d %{buildroot}%{_sysconfdir}/%{name} install -d %{buildroot}%{_sysconfdir}/%{name}
install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}
install -Dpm 755 target/release/speedtest-rs %{buildroot}%{_bindir}/speedtest-rs install -Dpm 755 target/release/speedtest-rs %{buildroot}%{_bindir}/speedtest-rs
install -d %{buildroot}%{_sharedstatedir}/%{name} install -d %{buildroot}%{_libdir}/%{name}
install -Dpm 644 assets/* %{buildroot}%{_sharedstatedir}/%{name} install -Dpm 644 assets/* %{buildroot}%{_libdir}/%{name}
ln -s example-singleServer-full.html %{buildroot}%{_sharedstatedir}/%{name}/index.html ln -s example-singleServer-full.html %{buildroot}%{_libdir}/%{name}/index.html
install -Dpm 644 %{SOURCE1} %{buildroot}%{_unitdir}/speedtest-rs.service install -Dpm 644 %{SOURCE1} %{buildroot}%{_unitdir}/speedtest-rs.service
install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/speedtest-rs.conf install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/speedtest-rs.conf
@ -37,7 +39,7 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/speedtest-rs.conf
%license LICENSE %license LICENSE
%{_sysconfdir}/%{name} %{_sysconfdir}/%{name}
%{_bindir}/speedtest-rs %{_bindir}/speedtest-rs
%{_sharedstatedir}/%{name} %{_libdir}/%{name}
%{_unitdir}/speedtest-rs.service %{_unitdir}/speedtest-rs.service
%{_sysusersdir}/speedtest-rs.conf %{_sysusersdir}/speedtest-rs.conf