From d5d722b8c08a2f42041aec99d61f7106820663c5 Mon Sep 17 00:00:00 2001
From: Sukru Senli <sukru.senli@iopsys.eu>
Date: Tue, 11 May 2021 21:57:06 +0200
Subject: [PATCH] mosquitto: init script fixes
---
net/mosquitto/files/etc/init.d/mosquitto | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/mosquitto/files/etc/init.d/mosquitto b/net/mosquitto/files/etc/init.d/mosquitto
index b42fa8866c..99fbfadc90 100755
--- a/net/mosquitto/files/etc/init.d/mosquitto
+++ b/net/mosquitto/files/etc/init.d/mosquitto
@@ -54,17 +54,15 @@ append_optional_bool() {
convert_mosq_general() {
local cfg="$1"
config_get destinations "$1" log_dest
- for dest in $destinations; do
- echo "log_dest $dest" >> $TCONF
- done
+ [ -n "$destinations" ] && echo "log_dest $destinations" >> $TCONF
config_get_bool no_remote "$1" no_remote_access 0
if [ "$no_remote" -eq 1 ]; then
echo "bind_address localhost" >> $TCONF
fi
- config_get port "$1" port 1883
- echo "port $port" >> $TCONF
+ config_get port "$1" port #1883
+ [ -n "$port" ] && echo "port $port" >> $TCONF
append_if "$1" acl_file
append_optional_bool "$1" allow_anonymous
append_optional_bool "$1" allow_duplicate_messages
@@ -75,7 +73,7 @@ convert_mosq_general() {
append_optional_bool "$1" log_timestamp
config_get log_types "$1" log_types
for log_type in $log_types; do
- echo "log_dest $log_type" >> $TCONF
+ echo "log_type $log_type" >> $TCONF
done
append_if "$1" max_inflight_bytes
append_if "$1" max_inflight_messages
@@ -146,6 +144,8 @@ add_listener() {
append_optional_bool "$1" use_subject_as_username
append_if "$1" psk_hint
append_if "$1" auth_plugin
+ append_if "$1" password_file
+ append_optional_bool "$1" allow_anonymous
# Careful, this relies on internal behaviour of the cfg_load functions!
set | grep "CONFIG_$1_auth_opt_" | sed "s/^.*_\(auth_opt_.*\)='\(.*\)'/\1 \2/" >> $TCONF
--
GitLab