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

net/stunnel: check if service section is configured to prevent crash loop

Browse source 
If a service section is not presented in the configuration then stunnel will
always start anyway. This ends in a crash loop because the configuration is not
valid.
Checking in "uci" mode if a service section is presented and only then
start the stunnel service will solve this issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2018-01-23 11:35:30 +01:00
parent 66349b4cd9
commit 68f6fc25a0
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
net/stunnel/files/stunnel.init
View file

@ -7,6 +7,7 @@ USE_PROCD=1
PID_FILE="/var/run/stunnel.pid" PID_FILE="/var/run/stunnel.pid"
CONF_FILE="/tmp/stunnel.conf" CONF_FILE="/tmp/stunnel.conf"
BIN="/usr/bin/stunnel" BIN="/usr/bin/stunnel"
SERVICE_SECTION_FOUND=0
global_defs() { global_defs() {
local debug compression local debug compression
@ -86,6 +87,7 @@ service_section() {
config_get_bool enabled "$cfg" 'enabled' '1' config_get_bool enabled "$cfg" 'enabled' '1'
[ ${enabled} -gt 0 ] || return 0 [ ${enabled} -gt 0 ] || return 0
SERVICE_SECTION_FOUND=1
printf "\n" >> "$CONF_FILE" printf "\n" >> "$CONF_FILE"
printf "[%s]\n" "$cfg" >> "$CONF_FILE" printf "[%s]\n" "$cfg" >> "$CONF_FILE"
@ -150,6 +152,8 @@ process_config() {
rm -f "$CONF_FILE" rm -f "$CONF_FILE"
# Symlink "alt_config_file" since it's a bit easier and safer # Symlink "alt_config_file" since it's a bit easier and safer
ln -s "$alt_config_file" "$CONF_FILE" ln -s "$alt_config_file" "$CONF_FILE"
# Set section found to start service user hopfully knows what you does
SERVICE_SECTION_FOUND=1
return 0 return 0
} }
@ -161,14 +165,16 @@ service_triggers() {
} }
start_service() { start_service() {
procd_open_instance
procd_set_param command "$BIN"
procd_append_param command "$CONF_FILE"
process_config process_config
# set auto respawn behavior if [ "$SERVICE_SECTION_FOUND" = 1 ]; then
procd_set_param respawn procd_open_instance
procd_set_param file "$CONF_FILE" procd_set_param command "$BIN"
procd_close_instance procd_append_param command "$CONF_FILE"
procd_set_param respawn
procd_set_param file "$CONF_FILE"
procd_close_instance
else
logger -t stunnel -p daemon.info "No uci service section enabled or found!"
fi
} }