From 8362f46fe4fde6d32ef82e359738f5f7e3cff518 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 23 May 2020 16:03:21 -0700
Subject: [PATCH] gerbera: backport init and config changes from master

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 multimedia/gerbera/files/gerbera.config |  3 +++
 multimedia/gerbera/files/gerbera.init   | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/multimedia/gerbera/files/gerbera.config b/multimedia/gerbera/files/gerbera.config
index 811005a70c..6ada4aa97a 100644
--- a/multimedia/gerbera/files/gerbera.config
+++ b/multimedia/gerbera/files/gerbera.config
@@ -1,3 +1,6 @@
 config gerbera config
 	option enabled	'0'
+	option debug	'0'
+	option user	'gerbera'
+	option group	'gerbera'
 	option home	'/tmp/gerbera'
diff --git a/multimedia/gerbera/files/gerbera.init b/multimedia/gerbera/files/gerbera.init
index 2cc0a52bb1..191fb3b60a 100644
--- a/multimedia/gerbera/files/gerbera.init
+++ b/multimedia/gerbera/files/gerbera.init
@@ -7,32 +7,42 @@ PROG=/usr/bin/gerbera
 
 start_service() {
 	local enabled
+	local debug
+	local user
+	local group
 	local home
 
 	config_load 'gerbera'
 	config_get_bool enabled config 'enabled' '0'
+	config_get_bool debug config 'debug' '0'
 
 	[ "$enabled" -eq 0 ] && {
 		echo "Gerbera not enabled. Please enable in /etc/config/gerbera"
 		return 1
 	}
 
+	config_get user config 'user' 'gerbera'
+	config_get group config 'group' 'gerbera'
 	config_get home config 'home' '/tmp/gerbera'
 
 	[ -d "$home" ] || {
 		mkdir -p "$home"
-		chown gerbera:gerbera "$home"
+		chown "$user":"$group" "$home"
 
 		gerbera -m "$home" -f '' --create-config > "$home/config.xml" 2> /dev/null
+		chown "$user":"$group" "$home/config.xml"
+		chmod 600 "$home/config.xml"
+
 		echo "Created default gerbera config at $home/config.xml"
 		echo "Please edit to your liking and restart."
 		return 2
 	}
 
 	procd_open_instance
-	procd_set_param user gerbera
-	procd_set_param group gerbera
+	procd_set_param user "$user"
+	procd_set_param group "$group"
 	procd_set_param command "$PROG" -c "$home/config.xml"
+	procd_set_param stdout "$debug"
 	procd_set_param stderr 1
 	procd_close_instance
 }
-- 
2.30.2