aboutsummaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJulien Roy <julien@jroy.ca>2023-01-21 15:01:03 -0500
committerJulien Roy <julien@jroy.ca>2023-01-21 15:01:03 -0500
commitdea87108040c017853bfb6777e03043157fd1a94 (patch)
tree610b1b102faf903683dfe6248fbfee443b412635 /net-im
parent5c841c2b8862f0049c9786eb896a79e292d11785 (diff)
downloadMrRoy-Overlay-dea87108040c017853bfb6777e03043157fd1a94.tar.gz
MrRoy-Overlay-dea87108040c017853bfb6777e03043157fd1a94.tar.bz2
MrRoy-Overlay-dea87108040c017853bfb6777e03043157fd1a94.zip
net-im/conduit: improve systemd unit
Signed-off-by: Julien Roy <julien@jroy.ca>
Diffstat (limited to 'net-im')
-rw-r--r--net-im/conduit/conduit-0.5.0.ebuild8
-rw-r--r--net-im/conduit/files/conduit.confd3
-rw-r--r--net-im/conduit/files/conduit.service13
3 files changed, 19 insertions, 5 deletions
diff --git a/net-im/conduit/conduit-0.5.0.ebuild b/net-im/conduit/conduit-0.5.0.ebuild
index 0c18cb5..e4f68e0 100644
--- a/net-im/conduit/conduit-0.5.0.ebuild
+++ b/net-im/conduit/conduit-0.5.0.ebuild
@@ -564,6 +564,10 @@ RDEPEND="acct-user/conduit"
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/clang"
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
src_unpack() {
cargo_src_unpack
@@ -734,7 +738,7 @@ src_unpack() {
src_install() {
cargo_src_install
- dodir "/var/lib/matrix-conduit"
+ keepdir "/var/lib/matrix-conduit"
fowners conduit:conduit "/var/lib/matrix-conduit"
fperms 700 "/var/lib/matrix-conduit"
@@ -742,5 +746,5 @@ src_install() {
doins "${FILESDIR}/conduit.toml"
newinitd "${FILESDIR}/conduit.initd" "conduit"
newconfd "${FILESDIR}/conduit.confd" "conduit"
- systemd_dounit "${FILESDIR}/conduit.unit"
+ systemd_newunit "${FILESDIR}/conduit.service"
}
diff --git a/net-im/conduit/files/conduit.confd b/net-im/conduit/files/conduit.confd
index 885fc75..98c2405 100644
--- a/net-im/conduit/files/conduit.confd
+++ b/net-im/conduit/files/conduit.confd
@@ -1,5 +1,2 @@
# Configuration file for conduit
-
-supervisor=supervise-daemon
-
export CONDUIT_CONFIG=/etc/conduit/conduit.toml
diff --git a/net-im/conduit/files/conduit.service b/net-im/conduit/files/conduit.service
new file mode 100644
index 0000000..f723864
--- /dev/null
+++ b/net-im/conduit/files/conduit.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Conduit Matrix Server
+After=network.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/conduit
+User=conduit
+Group=conduit
+Restart=always
+ExecStart=/usr/bin/conduit
+
+[Install]
+WantedBy=multi-user.target \ No newline at end of file