diff --git a/speedtest-rs.service b/speedtest-rs.service index 4c8a9b8..4ac4701 100644 --- a/speedtest-rs.service +++ b/speedtest-rs.service @@ -6,7 +6,7 @@ After=network.target [Service] User=speedtest Group=speedtest -Environment=SPEEDTEST_LATITUDE=0.0 SPEEDTEST_LONGITUDE=0.0 SPEEDTEST_ADDRESS=127.0.0.1 SPEEDTEST_DIR=/usr/lib/speedtest-rs SPEEDTEST_PORT=8000 +Environment=SPEEDTEST_LATITUDE=0.0 SPEEDTEST_LONGITUDE=0.0 SPEEDTEST_ADDRESS=127.0.0.1 SPEEDTEST_DIR=/usr/share/speedtest-rs SPEEDTEST_PORT=8000 EnvironmentFile=-/etc/speedtest-rs/config.env 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 diff --git a/speedtest-rs.spec b/speedtest-rs.spec index 1fc44e1..b99a666 100644 --- a/speedtest-rs.spec +++ b/speedtest-rs.spec @@ -29,9 +29,9 @@ cargo build --release install -d %{buildroot}%{_sysconfdir}/%{name} install -Dpm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name} install -Dpm 755 target/release/speedtest-rs %{buildroot}%{_bindir}/speedtest-rs -install -d %{buildroot}%{_libdir}/%{name} -install -Dpm 644 assets/* %{buildroot}%{_libdir}/%{name} -ln -s example-singleServer-full.html %{buildroot}%{_libdir}/%{name}/index.html +install -d %{buildroot}%{_datadir}/%{name} +install -Dpm 644 assets/* %{buildroot}%{_datadir}/%{name} +ln -s example-singleServer-full.html %{buildroot}%{_datadir}/%{name}/index.html install -Dpm 644 %{SOURCE1} %{buildroot}%{_unitdir}/speedtest-rs.service install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/speedtest-rs.conf @@ -39,7 +39,7 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/speedtest-rs.conf %license LICENSE %{_sysconfdir}/%{name} %{_bindir}/speedtest-rs -%{_libdir}/%{name} +%{_datadir}/%{name} %{_unitdir}/speedtest-rs.service %{_sysusersdir}/speedtest-rs.conf