Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NOISSUE: fix envs for nginx #1215

Merged
merged 1 commit into from
Jul 8, 2020
Merged

NOISSUE: fix envs for nginx #1215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker/nginx/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ envsubst '
${MF_USERS_HTTP_PORT}
${MF_THINGS_HTTP_PORT}
${MF_HTTP_ADAPTER_PORT}
${MF_NGINX_MQTT_PORT}
manuio marked this conversation as resolved.
Show resolved Hide resolved
${MF_NGINX_MQTTS_PORT}
${MF_WS_ADAPTER_PORT}' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf

exec nginx -g "daemon off;"
8 changes: 4 additions & 4 deletions docker/nginx/nginx-key.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions docker/nginx/nginx-x509.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down