Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7257 from jonathanunderwood/stubby_fix_init

Browse source 
stubby: fix loading of config file
This commit is contained in:
Dirk Brenken 2018-11-04 13:36:29 +01:00 committed by GitHub
commit 8e00bab166
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/stubby/files/stubby.init
View file

@ -157,7 +157,6 @@ start_service() {
local manual local manual
local log_level local log_level
local command_line_arguments local command_line_arguments
local stubby_args
mkdir -p "$stubby_config_dir" mkdir -p "$stubby_config_dir"
@ -173,16 +172,9 @@ start_service() {
mv "$config_file_tmp" "$stubby_config" mv "$config_file_tmp" "$stubby_config"
fi fi
stubby_args=""
config_get command_line_arguments "global" command_line_arguments "" config_get command_line_arguments "global" command_line_arguments ""
if [ -n "$command_line_arguments" ]; then
stubby_args="$command_line_arguments"
fi
config_get log_level "global" log_level "" config_get log_level "global" log_level ""
if [ -n "$log_level" ]; then
stubby_args="$stubby_args -v$log_level"
fi
if [ $("${stubby_init}" enabled; printf "%u" ${?}) -eq 0 ]; then if [ $("${stubby_init}" enabled; printf "%u" ${?}) -eq 0 ]; then
if [ -n "${stubby_boot}" ]; then if [ -n "${stubby_boot}" ]; then
@ -192,7 +184,13 @@ start_service() {
fi fi
fi fi
procd_open_instance "stubby" procd_open_instance "stubby"
procd_set_param command "$stubby" "$stubby_args" -C "$stubby_config" procd_set_param command "$stubby" -C "$stubby_config"
if [ -n "$log_level" ]; then
procd_append_param command -v "$log_level"
fi
if [ -n "$command_line_arguments" ]; then
procd_append_param command "$command_line_arguments"
fi
procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
procd_set_param file "$stubby_config" procd_set_param file "$stubby_config"
procd_set_param stdout 1 procd_set_param stdout 1