mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

sulu-builder: sulu.sh run script through linter, and minor readability changes

Browse source
This commit is contained in:
Reidar Cederqvist 2023-11-27 10:29:00 +01:00 • committed by Vivek Kumar Dutta
parent 3b0097078d
commit d1ea18952f
1 changed files with 91 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
sulu/sulu-builder/files/etc/sulu/sulu.sh
View file

@ -1,18 +1,18 @@
#!/bin/sh #!/bin/sh
# format using "shfmt"
. /lib/functions.sh . /lib/functions.sh
_RESTART_SERVICES="0" _RESTART_SERVICES="0"
mkdir -p /tmp/sulu/ mkdir -p /tmp/sulu/
function slog() function slog() {
{
echo "$*" | logger -t sulu.init -p debug echo "$*" | logger -t sulu.init -p debug
} }
function _get_agent_id() function _get_agent_id() {
{
local oui serial endpointid local oui serial endpointid
endpointid="$(uci_get obuspa localagent EndpointID)" endpointid="$(uci_get obuspa localagent EndpointID)"
@ -26,8 +26,7 @@ function _get_agent_id()
fi fi
} }
function _get_endpoint_id() function _get_endpoint_id() {
{
local oui serial endpointid local oui serial endpointid
endpointid="$(uci_get obuspa localagent EndpointID)" endpointid="$(uci_get obuspa localagent EndpointID)"
@ -40,50 +39,43 @@ function _get_endpoint_id()
fi fi
} }
function _get_sulu_users() function _get_sulu_users() {
{
echo "$(uci -q get sulu.global.user)" echo "$(uci -q get sulu.global.user)"
} }
function _get_sulu_root() function _get_sulu_root() {
{
local root local root
root="$(uci -q get nginx._sulu_s.root)" root="$(uci -q get nginx._sulu_s.root)"
echo "${root:-/sulu}" echo "${root:-/sulu}"
} }
function _get_sulu_connection_config() function _get_sulu_connection_config() {
{
local config local config
config="$(_get_sulu_root)/presets/connection-config.json" config="$(_get_sulu_root)/presets/connection-config.json"
echo "${config}" echo "${config}"
} }
function _get_sulu_session_mode() function _get_sulu_session_mode() {
{
echo "$(uci -q get sulu.global.SessionMode)" echo "$(uci -q get sulu.global.SessionMode)"
} }
function _get_usp_upstream_port() function _get_usp_upstream_port() {
{
local port local port
port="$(uci -q get mosquitto.sulu.port)" port="$(uci -q get mosquitto.sulu.port)"
echo "${port:-9009}" echo "${port:-9009}"
} }
function _get_sulu_acl_file() function _get_sulu_acl_file() {
{
local file local file
file="$(uci -q get mosquitto.sulu.acl_file)" file="$(uci -q get mosquitto.sulu.acl_file)"
echo "${file}" echo "${file}"
} }
function _get_sulu_http_port() function _get_sulu_http_port() {
{
local port listen local port listen
listen="$(uci -q get nginx._sulu_http.listen)" listen="$(uci -q get nginx._sulu_http.listen)"
@ -92,8 +84,7 @@ function _get_sulu_http_port()
echo "${port:-8080}" echo "${port:-8080}"
} }
function update_nginx_template() function update_nginx_template() {
{
local port local port
UCI_TEMPLATE="/etc/nginx/uci.conf.template" UCI_TEMPLATE="/etc/nginx/uci.conf.template"
@ -105,44 +96,50 @@ function update_nginx_template()
fi fi
} }
function generate_sulu_conn_config() function generate_sulu_conn_config() {
{
local users SCONFIG session local users SCONFIG session
users="$(_get_sulu_users)" users="$(_get_sulu_users)"
session="$(_get_sulu_session_mode)" session="$(_get_sulu_session_mode)"
SCONFIG="$(_get_sulu_connection_config)" SCONFIG="$(_get_sulu_connection_config)"
json_init; json_init
json_add_string 'Current-connection' 'main'; json_add_string 'Current-connection' 'main'
json_add_object 'Connections'; json_add_object 'Connections'
json_add_object 'main'; {
json_add_string 'toId' "$(_get_endpoint_id)"; json_add_object 'main'
json_add_string 'port' "auto"; {
json_add_string 'path' "/wss"; json_add_string 'toId' "$(_get_endpoint_id)"
json_add_string 'port' "auto"
json_add_string 'path' "/wss"
if [ "${session}" = "Require" ]; then if [ "${session}" = "Require" ]; then
json_add_boolean 'useSession' 1; json_add_boolean 'useSession' 1
fi fi
json_add_string 'protocol' 'autoWs'; json_add_string 'protocol' 'autoWs'
json_add_object 'overrides'; json_add_object 'overrides'
for f in ${users}; do {
json_add_object "${f}"; for user in ${users}; do
json_add_string 'fromId' "self::sulu-${f}"; json_add_object "${user}"
json_add_string 'publishEndpoint' "/usp/$(_get_agent_id)/${f}/endpoint"; {
json_add_string 'subscribeEndpoint' "/usp/$(_get_agent_id)/${f}/controller"; json_add_string 'fromId' "self::sulu-${user}"
json_close_object; json_add_string 'publishEndpoint' "/usp/$(_get_agent_id)/${user}/endpoint"
json_add_string 'subscribeEndpoint' "/usp/$(_get_agent_id)/${user}/controller"
json_close_object
}
done done
json_close_object; json_close_object
json_close_object; }
json_close_object; json_close_object
}
json_close_object
}
json_dump >${SCONFIG} json_dump >${SCONFIG}
} }
function _remove_obuspa_config() function _remove_obuspa_config() {
{
local restart session local restart session
restart=0 restart=0
@ -169,55 +166,54 @@ function _update_obuspa_config_rbac() {
session="$(_get_sulu_session_mode)" session="$(_get_sulu_session_mode)"
restart=0 restart=0
for f in ${users}; do for user in ${users}; do
local sec local section
# Add mqtt # Add mqtt
sec="mqtt_sulu_${f}" section="mqtt_sulu_${user}"
if ! uci_get obuspa ${sec} >/dev/null 2>&1; then if ! uci_get obuspa ${section} >/dev/null 2>&1; then
uci_add obuspa mqtt ${sec} uci_add obuspa mqtt ${section}
uci_set obuspa ${sec} BrokerAddress "127.0.0.1" uci_set obuspa ${section} BrokerAddress "127.0.0.1"
uci_set obuspa ${sec} BrokerPort "1883" uci_set obuspa ${section} BrokerPort "1883"
uci_set obuspa ${sec} TransportProtocol "TCP/IP" uci_set obuspa ${section} TransportProtocol "TCP/IP"
restart=1 restart=1
fi fi
# Add mtp # Add mtp
sec="mtp_sulu_${f}" section="mtp_sulu_${user}"
if ! uci_get obuspa ${sec} >/dev/null 2>&1; then if ! uci_get obuspa ${section} >/dev/null 2>&1; then
uci_add obuspa mtp ${sec} uci_add obuspa mtp ${section}
uci_set obuspa ${sec} Protocol "MQTT" uci_set obuspa ${section} Protocol "MQTT"
uci_set obuspa ${sec} ResponseTopicConfigured "/usp/${agent}/${f}/endpoint" uci_set obuspa ${section} ResponseTopicConfigured "/usp/${agent}/${user}/endpoint"
uci_set obuspa ${sec} mqtt "mqtt_sulu_$f" uci_set obuspa ${section} mqtt "mqtt_sulu_$user"
restart=1 restart=1
fi fi
# Add controller # Add controller
sec="controller_sulu_${f}" section="controller_sulu_${user}"
if ! uci_get obuspa ${sec} >/dev/null 2>&1; then if ! uci_get obuspa ${section} >/dev/null 2>&1; then
uci_add obuspa controller ${sec} uci_add obuspa controller ${section}
uci_set obuspa ${sec} EndpointID "self::sulu-${f}" uci_set obuspa ${section} EndpointID "self::sulu-${user}"
uci_set obuspa ${sec} Protocol "MQTT" uci_set obuspa ${section} Protocol "MQTT"
uci_set obuspa ${sec} Topic "/usp/${agent}/${f}/controller" uci_set obuspa ${section} Topic "/usp/${agent}/${user}/controller"
uci_set obuspa ${sec} mqtt "mqtt_sulu_$f" uci_set obuspa ${section} mqtt "mqtt_sulu_$user"
uci_set obuspa ${sec} assigned_role_name "$f" uci_set obuspa ${section} assigned_role_name "$user"
restart=1 restart=1
fi fi
obMode="$(uci_get obuspa ${sec} SessionMode)" obMode="$(uci_get obuspa ${section} SessionMode)"
if [ "${session}" != "${obMode}" ]; then if [ "${session}" != "${obMode}" ]; then
uci_set obuspa ${sec} SessionMode "${session}" uci_set obuspa ${section} SessionMode "${session}"
restart=1 restart=1
fi fi
done done
return "${restart}" return "${restart}"
} }
function _remove_sulu_sec() function _remove_sulu_section() {
{ local section="$1"
local sec
if [[ "${1}" == *"_sulu_"* ]]; then if [[ "${section}" == *"_sulu_"* ]]; then
uci_remove obuspa ${1} uci_remove obuspa ${1}
return 1 return 1
fi fi
@ -242,12 +238,12 @@ function _create_acl() {
users="$(_get_sulu_users)" users="$(_get_sulu_users)"
agentid="$(_get_agent_id)" agentid="$(_get_agent_id)"
for f in ${users}; do for user in ${users}; do
if ! grep -q "user $f" ${ACL_FILE}; then if ! grep -q "user $user" ${ACL_FILE}; then
echo "user ${f}" >> ${ACL_FILE} echo "user ${user}" >>${ACL_FILE}
echo "topic read /usp/${agentid}/${f}/controller/reply-to/#" >> ${ACL_FILE} echo "topic read /usp/${agentid}/${user}/controller/reply-to/#" >>${ACL_FILE}
echo "topic write /usp/${agentid}/${f}/endpoint/#" >> ${ACL_FILE} echo "topic write /usp/${agentid}/${user}/endpoint/#" >>${ACL_FILE}
echo "topic read /usp/${agentid}/${f}/controller/#" >> ${ACL_FILE} echo "topic read /usp/${agentid}/${user}/controller/#" >>${ACL_FILE}
echo "" >>${ACL_FILE} echo "" >>${ACL_FILE}
restart="1" restart="1"
fi fi
@ -259,8 +255,7 @@ function _create_acl() {
fi fi
} }
function update_obuspa_config() function update_obuspa_config() {
{
local restart local restart
restart=0 restart=0
@ -278,8 +273,7 @@ function update_obuspa_config()
fi fi
} }
function configure_sulu() function configure_sulu() {
{
local sys_cred restart local sys_cred restart
sys_cred="${1}" sys_cred="${1}"