mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-11-07 21:02:53 -05:00
Minor Docker fixes and nice things (#7120)
This commit is contained in:
@@ -22,7 +22,6 @@ else
|
||||
fi
|
||||
|
||||
if [[ ${DYNAMIC_CONFIG,,} =~ ^(true|yes)$ ]]; then
|
||||
cat "$CONFIG_FILE"
|
||||
echo "Using Dynamic Configuration values..."
|
||||
|
||||
# BEGIN DATABASE CONFIGURATION FIELDS
|
||||
@@ -245,7 +244,7 @@ if [[ ${DYNAMIC_CONFIG,,} =~ ^(true|yes)$ ]]; then
|
||||
# certUrl
|
||||
if [[ -n $REVERSE_PROXY ]] && [[ -n $REVERSE_PROXY_TLS_PORT ]]; then
|
||||
REVERSE_PROXY_STRING="${REVERSE_PROXY}:${REVERSE_PROXY_TLS_PORT}"
|
||||
|
||||
|
||||
echo "Setting certUrl... - $REVERSE_PROXY_STRING"
|
||||
sed -i 's/"_certUrl"/"certUrl"/' "$CONFIG_FILE"
|
||||
jq --arg cert_url "$REVERSE_PROXY_STRING" \
|
||||
@@ -257,7 +256,7 @@ if [[ ${DYNAMIC_CONFIG,,} =~ ^(true|yes)$ ]]; then
|
||||
sed -i 's/"certUrl":/"_certUrl":/g' "$CONFIG_FILE"
|
||||
fi
|
||||
|
||||
echo -e "\n$(cat "$CONFIG_FILE")"
|
||||
cat "$CONFIG_FILE"
|
||||
else
|
||||
echo "Leaving config as-is."
|
||||
fi
|
||||
@@ -266,4 +265,4 @@ fi
|
||||
node /opt/meshcentral/meshcentral/meshcentral --configfile "${CONFIG_FILE}" "${ARGS}" >> /proc/1/fd/1 &
|
||||
meshcentral_pid=$!
|
||||
|
||||
wait "$meshcentral_pid"
|
||||
wait "$meshcentral_pid"
|
||||
|
||||
Reference in New Issue
Block a user