mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

mosquitto: allow auth options with per listener settings 

Some settings can be either global or per listener, and we need to
support both forms in UCI.

Signed-off-by: Karl Palsson <karlp@etactica.com>
This commit is contained in:
Karl Palsson 2021-08-24 14:19:41 +00:00
parent 734f65d557
commit 0be066d1c2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/mosquitto/files/etc/init.d/mosquitto
View File

@ -64,6 +64,8 @@ convert_mosq_general() {
fi
append_if "$1" port
# per listener settings must be set before any potential security settings
append_optional_bool "$1" per_listener_settings
append_if "$1" acl_file
append_optional_bool "$1" allow_anonymous
append_optional_bool "$1" allow_duplicate_messages
@ -91,9 +93,9 @@ convert_mosq_general() {
append_if "$1" sys_interval
append_optional_bool "$1" upgrade_outgoing_qos
append_if "$1" user
append_optional_bool "$1" per_listener_settings
append_if "$1" websockets_log_level
append_if "$1" websockets_headers_size
# can be general or per listener, see per_listener_settings
append_if "$1" auth_plugin
# Careful, this relies on internal behaviour of the cfg_load functions!
set | grep "CONFIG_$1_auth_opt_" | sed "s/^.*_\(auth_opt_.*\)='\(.*\)'/\1 \2/" >> $TCONF
@ -157,6 +159,10 @@ add_listener() {
append_optional_bool "$1" use_identity_as_username
append_optional_bool "$1" use_subject_as_username
append_if "$1" psk_hint
# can be general or per listener, see per_listener_settings
append_if "$1" auth_plugin
# Careful, this relies on internal behaviour of the cfg_load functions!
set | grep "CONFIG_$1_auth_opt_" | sed "s/^.*_\(auth_opt_.*\)='\(.*\)'/\1 \2/" >> $TCONF
}
add_topic() {