Remove multiple stream directives

Signed-off-by: felix.gateru <[email protected]>
absmach · Apr 4, 2024 · 03636b5 · 03636b5
1 parent 65452d9
commit 03636b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/docker/nginx/nginx-key.conf b/docker/nginx/nginx-key.conf
@@ -188,13 +188,13 @@ http {
     }
 }
 
-# MQTT
 stream {
    include snippets/stream_access_log.conf;
 
+    # MQTT
     # Include single-node or multiple-node (cluster) upstream
     include snippets/mqtt-upstream.conf;
-
+    
     server {
         listen ${MG_NGINX_MQTT_PORT};
         listen [::]:${MG_NGINX_MQTT_PORT};
@@ -205,13 +205,8 @@ stream {
 
         proxy_pass mqtt_cluster;
     }
-}
-
-# CoAP
-stream {
-   include snippets/stream_access_log.conf;
 
-    # Include upstream
+    # CoAP
     include snippets/coap-upstream.conf;
 
     server {
@@ -225,4 +220,5 @@ stream {
         proxy_pass coap_cluster;
     }
 }
+
 error_log info.log info;
diff --git a/docker/nginx/nginx-x509.conf b/docker/nginx/nginx-x509.conf
@@ -210,11 +210,14 @@ stream {
 
     js_import authorization from /etc/nginx/authorization.js;
 
-    # Include single-node or multiple-node (cluster) upstream
-    include snippets/mqtt-upstream.conf;
     ssl_verify_client on;
     include snippets/ssl-client.conf;
 
+    # MQTT
+    # Include single-node or multiple-node (cluster) upstream
+    include snippets/mqtt-upstream.conf;
+
+
     server {
         listen ${MG_NGINX_MQTT_PORT};
         listen [::]:${MG_NGINX_MQTT_PORT};
@@ -226,21 +229,9 @@ stream {
 
         proxy_pass mqtt_cluster;
     }
-}
-
-#CoAP
-stream {
-   include snippets/stream_access_log.conf;
-
-    # Include JS script for mTLS
-    js_path "/etc/nginx/njs/";
 
-    js_import authorization from /etc/nginx/authorization.js;
-
-    # Include upstream
+    # CoAP
     include snippets/coap-upstream.conf;
-    ssl_verify_client on;
-    include snippets/ssl-client.conf;
 
     server {
         listen ${MF_NGINX_COAP_PORT};

diff --git a/docker/nginx/snippets/coap-upstream.conf b/docker/nginx/snippets/coap-upstream.conf
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 upstream coap_cluster {
-        server coap-adapter:${MF_COAP_ADAPTER_HTTP_PORT};
-}
+        server coap-adapter:5683;
+}