From 09d09c6ef55f5bb10aa53348255b209710a990be Mon Sep 17 00:00:00 2001 From: Mirko Teodorovic Date: Wed, 8 Jul 2020 10:42:33 +0200 Subject: [PATCH] fix envs for nginx (#1215) Signed-off-by: Mirko Teodorovic --- docker/nginx/entrypoint.sh | 2 ++ docker/nginx/nginx-key.conf | 8 ++++---- docker/nginx/nginx-x509.conf | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docker/nginx/entrypoint.sh b/docker/nginx/entrypoint.sh index 1df02be9..6f65f327 100755 --- a/docker/nginx/entrypoint.sh +++ b/docker/nginx/entrypoint.sh @@ -13,6 +13,8 @@ envsubst ' ${MF_USERS_HTTP_PORT} ${MF_THINGS_HTTP_PORT} ${MF_HTTP_ADAPTER_PORT} + ${MF_NGINX_MQTT_PORT} + ${MF_NGINX_MQTTS_PORT} ${MF_WS_ADAPTER_PORT}' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf exec nginx -g "daemon off;" diff --git a/docker/nginx/nginx-key.conf b/docker/nginx/nginx-key.conf index 994df8ab..092375ac 100644 --- a/docker/nginx/nginx-key.conf +++ b/docker/nginx/nginx-key.conf @@ -95,10 +95,10 @@ stream { include snippets/mqtt-upstream.conf; server { - listen 1883; - listen [::]:1883; - listen 8883 ssl; - listen [::]:8883 ssl; + listen ${MF_NGINX_MQTT_PORT}; + listen [::]:${MF_NGINX_MQTT_PORT}; + listen ${MF_NGINX_MQTTS_PORT} ssl; + listen [::]:${MF_NGINX_MQTTS_PORT} ssl; include snippets/ssl.conf; diff --git a/docker/nginx/nginx-x509.conf b/docker/nginx/nginx-x509.conf index 1d37a006..31d40c20 100644 --- a/docker/nginx/nginx-x509.conf +++ b/docker/nginx/nginx-x509.conf @@ -109,10 +109,10 @@ stream { include snippets/ssl-client.conf; server { - listen 1883; - listen [::]:1883; - listen 8883 ssl; - listen [::]:8883 ssl; + listen ${MF_NGINX_MQTT_PORT}; + listen [::]:${MF_NGINX_MQTT_PORT}; + listen ${MF_NGINX_MQTTS_PORT} ssl; + listen [::]:${MF_NGINX_MQTTS_PORT} ssl; include snippets/ssl.conf; js_preread authenticate;