From 9e3cbbc1f70a4b2d64f3ff6bc2bbfe36627aad12 Mon Sep 17 00:00:00 2001 From: Erik Karlsson Date: Thu, 21 Aug 2025 13:59:22 +0200 Subject: [PATCH] sulu: remove faulty mosquitto option The actual spelling of this option is require_certificate and it is anyway not relevant here since it is not a TLS listener. --- .../files/etc/uci-defaults/40-add-sulu-config | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-config b/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-config index e84e186df..5ede27fc9 100644 --- a/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-config +++ b/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-config @@ -19,10 +19,10 @@ update_nginx_uci_template() port="$(uci -q get mosquitto.sulu.port)" port="${port:-9009}" - if ! grep -q "upstream websocket" ${UCI_TEMPLATE}; then + if ! grep -q "upstream websocket" ${UCI_TEMPLATE}; then sed -i '/#UCI_HTTP_CONFIG$/i\ map $http_upgrade $connection_upgrade { default upgrade; "" close; }' ${UCI_TEMPLATE} sed -i "/#UCI_HTTP_CONFIG$/i\ upstream websocket { server 127.0.0.1:${port}; }" ${UCI_TEMPLATE} - fi + fi } add_sulu_config_to_mosquitto() @@ -33,7 +33,6 @@ add_sulu_config_to_mosquitto() uci_set mosquitto sulu port '9009' uci_set mosquitto sulu no_remote_access '1' uci_set mosquitto sulu protocol 'websockets' - uci_set mosquitto sulu require_certificates '0' uci_set mosquitto sulu auth_plugin '/usr/lib/mosquitto_auth_shadow.so' uci_set mosquitto sulu acl_file '/etc/sulu/mqtt.acl' fi @@ -49,10 +48,10 @@ add_sulu_userinterface_uci() uci_set userinterface _sulu_s port '8443' uci_add_list userinterface _sulu_s _nginx_include '/etc/sulu/nginx.locations' uci_set userinterface _sulu_s _nginx_uci_manage_ssl 'self-signed' - uci_set userinterface _sulu_s _nginx_ssl_certificate '/etc/nginx/conf.d/_lan.crt' - uci_set userinterface _sulu_s _nginx_ssl_certificate_key '/etc/nginx/conf.d/_lan.key' - uci_set userinterface _sulu_s _nginx_ssl_session_cache 'none' - uci_set userinterface _sulu_s protocol 'HTTPS' + uci_set userinterface _sulu_s _nginx_ssl_certificate '/etc/nginx/conf.d/_lan.crt' + uci_set userinterface _sulu_s _nginx_ssl_certificate_key '/etc/nginx/conf.d/_lan.key' + uci_set userinterface _sulu_s _nginx_ssl_session_cache 'none' + uci_set userinterface _sulu_s protocol 'HTTPS' uci_add_list userinterface _sulu_s role 'admin' uci_add_list userinterface _sulu_s role 'user' fi @@ -60,7 +59,7 @@ add_sulu_userinterface_uci() if ! uci_get userinterface _suluredirect >/dev/null 2>&1; then uci_add userinterface http_access _suluredirect uci_set userinterface _suluredirect redirect '_sulu_s' - uci_set userinterface _suluredirect protocol 'HTTP' + uci_set userinterface _suluredirect protocol 'HTTP' uci_set userinterface _suluredirect port "8080" fi }