From b8292ffdb61f6072fb53f8a58521ca8e1d078f1e Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Sat, 16 Jan 2021 18:01:03 +0000
Subject: [PATCH] Fix murmur service, it requires a db connection before
 forking to bg

---
 configs/murmur/APKBUILD |  4 ++--
 openrc/murmur/APKBUILD  | 11 ++++++-----
 openrc/murmur/runfile   | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 openrc/murmur/runfile

diff --git a/configs/murmur/APKBUILD b/configs/murmur/APKBUILD
index 1de2eee..06a5be3 100644
--- a/configs/murmur/APKBUILD
+++ b/configs/murmur/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=redxen-config-murmur
-pkgver=2021.01.04
+pkgver=2021.01.16
 pkgrel=0
 pkgdesc="Murmur configuration files"
 url="https://git.redxen.eu/RedXen"
@@ -18,4 +18,4 @@ package() {
 	install -Dm600 murmur.ini "$pkgdir"/etc/murmur/murmur.ini
 }
 
-sha512sums="814c7814d421a431a38c2f19b4a100d9a493345124c10b9bf6d0a4801b90b0027fa53eb0d87e20c5a5cf199f98e01f35a9c08814657ceecf0cbc52d3c869e909  murmur.ini"
+sha512sums="605776efaa579aab125e4713be672add7930dc45b4a5cc60ee6d90844eee1b246bd102db242b3c5aec4cddbf5e4e878abdc7161f4e303bb646258e4c61bd8cb4  murmur.ini"
diff --git a/openrc/murmur/APKBUILD b/openrc/murmur/APKBUILD
index 752d5af..ec3b7e6 100644
--- a/openrc/murmur/APKBUILD
+++ b/openrc/murmur/APKBUILD
@@ -1,22 +1,23 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=redxen-openrc-murmur
-pkgver=2020.12.12
+pkgver=2021.01.16
 pkgrel=0
 pkgdesc="Murmur OpenRC service files"
 url="https://git.redxen.eu/RedXen"
 arch="noarch"
 license="none"
-depends="openrc murmur-openrc redxen-config-murmur"
+depends="openrc redxen-config-murmur"
 options="!check"
 source="
+	runfile
 	conffile
 "
 builddir="$srcdir"
 
 package() {
-	mkdir -p "$pkgdir"/etc/init.d
-	ln -s murmur "$pkgdir"/etc/init.d/murmur.redxen
+	install -Dm755 runfile "$pkgdir"/etc/init.d/murmur.redxen
 	install -Dm644 conffile "$pkgdir"/etc/conf.d/murmur.redxen
 }
-sha512sums="a413a468528c615c283be6012e4d77d6dfb3db42279bd065e2eba17eca8892624d8815483e7f6e7e9583928702bb50c7cad394959d39637560f690f92738b849  conffile"
+sha512sums="0bca5004e9422e1e4cb87741d81ee32e7e7b939ea8e948d6496cf200a94b471f78219302d55f0419bd3361d9b62af5db3b36bdd9c173eafe20c44c21bfa42463  runfile
+a413a468528c615c283be6012e4d77d6dfb3db42279bd065e2eba17eca8892624d8815483e7f6e7e9583928702bb50c7cad394959d39637560f690f92738b849  conffile"
diff --git a/openrc/murmur/runfile b/openrc/murmur/runfile
new file mode 100644
index 0000000..27e0462
--- /dev/null
+++ b/openrc/murmur/runfile
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+
+depends() {
+	need localmount net yggdrasil
+	after firewall yggdrasil
+}
+
+description="Mumble VoIP Server"
+command="/usr/bin/murmurd"
+command_args="-ini ${INI_CONFIG:-/etc/murmur.ini}"
+pidfile="/run/murmur/murmur.pid"
+
+start_pre() {
+	checkpath --owner murmur:murmur --directory ${pidfile%/*}
+}
+
+# uses the openrc templates for start()/stop()
+
+