Skip to content

Commit 87a43ff

Browse files
committed
Update systemd units in deb package
1 parent 1ef442c commit 87a43ff

File tree

5 files changed

+32
-4
lines changed

5 files changed

+32
-4
lines changed

Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ indicatif = "0.17.9"
4141
include_dir = "0.7.4"
4242

4343
[package.metadata.deb]
44-
maintainer-scripts = "setup/debian/"
44+
maintainer-scripts = "setup/debian/scripts/"
4545
systemd-units = { enable = false }
4646
revision = ""
4747
assets = [
4848
["target/release/librespeed-rs","/usr/bin/librespeed-rs","755"],
4949
["assets/*","/var/lib/librespeed-rs/assets","644"],
5050
["configs.toml","/var/lib/librespeed-rs/configs.toml","644"],
51-
["country_asn.mmdb","/var/lib/librespeed-rs/country_asn.mmdb","644"]
51+
["country_asn.mmdb","/var/lib/librespeed-rs/country_asn.mmdb","644"],
52+
["setup/debian/speedtest_rs.service","/lib/systemd/system/speedtest_rs.service","644"],
53+
["setup/debian/speedtest_rs.socket","/lib/systemd/system/speedtest_rs.socket","644"]
5254
]
5355

5456
[profile.release]

setup/debian/scripts/postinst.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
3+
deb-systemd-helper unmask speedtest_rs.socket >/dev/null || true
4+
if deb-systemd-helper --quiet was-enabled speedtest_rs.socket; then
5+
deb-systemd-helper enable speedtest_rs.socket >/dev/null || true
6+
else
7+
deb-systemd-helper update-state speedtest_rs.socket >/dev/null || true
8+
fi
9+
fi

setup/debian/scripts/prerm.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
if [ -d /run/systemd/system ]; then
3+
deb-systemd-invoke stop speedtest_rs >/dev/null || true
4+
systemctl stop speedtest_rs.socket
5+
systemctl disable speedtest_rs.socket
6+
fi
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
[Unit]
12
Description=librespeed rust backend
2-
After=network.target
3+
Requires=speedtest_rs.socket
4+
After=network.target speedtest_rs.socket
35

46
[Service]
57
Type=simple
6-
ExecStart=/usr/bin/librespeed-rs
8+
ExecStart=/usr/bin/librespeed-rs -c /var/lib/librespeed-rs/configs.toml
79
WorkingDirectory=/var/lib/librespeed-rs/
810
Restart=always
911
RestartSec=10

setup/debian/speedtest_rs.socket

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[Unit]
2+
Description=librespeed rust backend (socket)
3+
PartOf=speedtest_rs.service
4+
5+
[Socket]
6+
ListenStream=8080
7+
8+
[Install]
9+
WantedBy=sockets.target

0 commit comments

Comments
 (0)