From 1ca0eb5d74e279656bb7d46407a5d6d520f1c0e7 Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Sat, 21 Jan 2023 15:42:31 -0500
Subject: net-im/heisenbridge: improve ebuild

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 net-im/heisenbridge/files/heisenbridge.confd   |  6 +++++-
 net-im/heisenbridge/files/heisenbridge.initd   | 14 +++++++++++++-
 net-im/heisenbridge/files/heisenbridge.service | 12 ++++++++++++
 net-im/heisenbridge/files/heisenbridge.unit    | 12 ------------
 net-im/heisenbridge/heisenbridge-1.14.1.ebuild |  3 +--
 5 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 net-im/heisenbridge/files/heisenbridge.service
 delete mode 100644 net-im/heisenbridge/files/heisenbridge.unit

(limited to 'net-im')

diff --git a/net-im/heisenbridge/files/heisenbridge.confd b/net-im/heisenbridge/files/heisenbridge.confd
index 61c56ea..f536922 100644
--- a/net-im/heisenbridge/files/heisenbridge.confd
+++ b/net-im/heisenbridge/files/heisenbridge.confd
@@ -14,4 +14,8 @@ LISTEN_PORT=9898
 # Generally should be the admin of the home server
 # For example: @user:home.server
 # Default: not set
-# OWNER=@user:home.server
\ No newline at end of file
+# OWNER=@user:home.server
+
+# Homeserver
+# Must be set
+HOMESERVER=example.com
\ No newline at end of file
diff --git a/net-im/heisenbridge/files/heisenbridge.initd b/net-im/heisenbridge/files/heisenbridge.initd
index 12824cd..b5af350 100644
--- a/net-im/heisenbridge/files/heisenbridge.initd
+++ b/net-im/heisenbridge/files/heisenbridge.initd
@@ -9,4 +9,16 @@ pidfile="/run/${RC_SVCNAME}.pid"
 command="/usr/bin/python"
 command_args="-m heisenbridge -c ${REGISTRATION} -l ${LISTEN_ADDRESS} -p ${LISTEN_PORT}  ${HOMESERVER}"
 command_background=true
-command_user="heisenbridge:heinsenbridge"
+command_user="heisenbridge:heisenbridge"
+
+output_log="/var/log/heisenbridge.log"
+error_log="/var/log/heisenbridge.log"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath -d -m 0755 -o "$command_user" /var/lib/heisenbridge
+	checkpath -f -m 0644 -o "$command_user" "$output_log"
+}
diff --git a/net-im/heisenbridge/files/heisenbridge.service b/net-im/heisenbridge/files/heisenbridge.service
new file mode 100644
index 0000000..b140c3d
--- /dev/null
+++ b/net-im/heisenbridge/files/heisenbridge.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=a bouncer-style Matrix IRC bridge
+After=network.target
+
+[Service]
+User=heisenbridge
+Group=heisenbridge
+Restart=always
+ExecStart=/usr/bin/python -m heisenbridge -c ${REGISTRATION} -r -l ${LISTEN_ADDRESS} -p ${LISTEN_PORT} ${HOMESERVER}
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/net-im/heisenbridge/files/heisenbridge.unit b/net-im/heisenbridge/files/heisenbridge.unit
deleted file mode 100644
index b140c3d..0000000
--- a/net-im/heisenbridge/files/heisenbridge.unit
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=a bouncer-style Matrix IRC bridge
-After=network.target
-
-[Service]
-User=heisenbridge
-Group=heisenbridge
-Restart=always
-ExecStart=/usr/bin/python -m heisenbridge -c ${REGISTRATION} -r -l ${LISTEN_ADDRESS} -p ${LISTEN_PORT} ${HOMESERVER}
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/net-im/heisenbridge/heisenbridge-1.14.1.ebuild b/net-im/heisenbridge/heisenbridge-1.14.1.ebuild
index 9c9763b..7620f28 100644
--- a/net-im/heisenbridge/heisenbridge-1.14.1.ebuild
+++ b/net-im/heisenbridge/heisenbridge-1.14.1.ebuild
@@ -36,8 +36,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/heisenbridge.initd" "${PN}"
 	newconfd "${FILESDIR}/heisenbridge.confd" "${PN}"
-	systemd_newunit "${FILESDIR}/${PN}.unit" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
 distutils_enable_tests pytest
-- 
cgit v1.2.3