Skip to content

Commit

Permalink
fix space, identation
Browse files Browse the repository at this point in the history
Signed-off-by: mteodor <[email protected]>
  • Loading branch information
mteodor committed Sep 30, 2021
1 parent e81831a commit 041776e
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 11 deletions.
4 changes: 1 addition & 3 deletions docker/nginx/nginx-key.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
add_header Access-Control-Allow-Headers '*';

server_name localhost;


# Proxy pass to users service
# Proxy pass to users service
location ~ ^/(users|tokens|password) {
include snippets/proxy-headers.conf;
proxy_pass http://users:${MF_USERS_HTTP_PORT};
Expand Down Expand Up @@ -111,6 +110,5 @@
include snippets/proxy-headers.conf;
proxy_pass http://ui:${MF_UI_PORT};
}

}

36 changes: 28 additions & 8 deletions docker/nginx/nginx-x509.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
# SPDX-License-Identifier: Apache-2.0

# This is the Mainflux NGINX configuration for mututal authentication based on X.509 certifiactes.




server {
listen 80 default_server;
listen [::]:80 default_server;
Expand All @@ -24,15 +20,12 @@

server_name localhost;


# Proxy pass to users service
location ~ ^/(users|tokens|password) {
include snippets/proxy-headers.conf;
proxy_pass http://users:${MF_USERS_HTTP_PORT};
}



# Proxy pass to things service
location ~ ^/(things|channels|connect) {
include snippets/proxy-headers.conf;
Expand Down Expand Up @@ -91,6 +84,33 @@
include snippets/ws-upgrade.conf;
proxy_pass http://mqtt_ws_cluster;
}

# Proxy pass to mainflux-influxdb-reader
location /reader/ {
include snippets/proxy-headers.conf;
proxy_pass http://influxdb-reader:${MF_INFLUX_READER_PORT}/;
}

# Proxy pass to mainflux-bootstrap
location /bootstrap/ {
include snippets/proxy-headers.conf;
proxy_pass http://bootstrap:${MF_BOOTSTRAP_PORT}/;
}

# Proxy pass to mainflux-opcua-adapter
location /browse {
include snippets/proxy-headers.conf;
proxy_pass http://opcua-adapter:${MF_OPCUA_ADAPTER_HTTP_PORT};
}

location ~ ^/(twins|states) {
include snippets/proxy-headers.conf;
proxy_pass http://twins:${MF_TWINS_HTTP_PORT};
}

location / {
include snippets/proxy-headers.conf;
proxy_pass http://ui:${MF_UI_PORT};
}
}
}

0 comments on commit 041776e

Please sign in to comment.