gerbera: backport init and config changes from master

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-05-23 16:03:21 -07:00
parent 225eeb9a6b
commit 8362f46fe4
2 changed files with 16 additions and 3 deletions

View file

@ -1,3 +1,6 @@
config gerbera config config gerbera config
option enabled '0' option enabled '0'
option debug '0'
option user 'gerbera'
option group 'gerbera'
option home '/tmp/gerbera' option home '/tmp/gerbera'

View file

@ -7,32 +7,42 @@ PROG=/usr/bin/gerbera
start_service() { start_service() {
local enabled local enabled
local debug
local user
local group
local home local home
config_load 'gerbera' config_load 'gerbera'
config_get_bool enabled config 'enabled' '0' config_get_bool enabled config 'enabled' '0'
config_get_bool debug config 'debug' '0'
[ "$enabled" -eq 0 ] && { [ "$enabled" -eq 0 ] && {
echo "Gerbera not enabled. Please enable in /etc/config/gerbera" echo "Gerbera not enabled. Please enable in /etc/config/gerbera"
return 1 return 1
} }
config_get user config 'user' 'gerbera'
config_get group config 'group' 'gerbera'
config_get home config 'home' '/tmp/gerbera' config_get home config 'home' '/tmp/gerbera'
[ -d "$home" ] || { [ -d "$home" ] || {
mkdir -p "$home" mkdir -p "$home"
chown gerbera:gerbera "$home" chown "$user":"$group" "$home"
gerbera -m "$home" -f '' --create-config > "$home/config.xml" 2> /dev/null 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 "Created default gerbera config at $home/config.xml"
echo "Please edit to your liking and restart." echo "Please edit to your liking and restart."
return 2 return 2
} }
procd_open_instance procd_open_instance
procd_set_param user gerbera procd_set_param user "$user"
procd_set_param group gerbera procd_set_param group "$group"
procd_set_param command "$PROG" -c "$home/config.xml" procd_set_param command "$PROG" -c "$home/config.xml"
procd_set_param stdout "$debug"
procd_set_param stderr 1 procd_set_param stderr 1
procd_close_instance procd_close_instance
} }