Update testing env

deploy/.env.local

@@ -1,4 +1,4 @@
-API_GATEWAY_PORT=48443
+API_GATEWAY_PORT=40056
-API_GATEWAY_UI_PORT=48444
+API_GATEWAY_UI_PORT=40057
-API_REGISTRY_UI_PORT=48445
+API_REGISTRY_UI_PORT=40058
-API_EVENTBUS_UI_PORT=48446
+API_EVENTBUS_UI_PORT=40059

deploy/egommerce-stack.dev.local.yml

@@ -5,36 +5,27 @@ services:
     env_file: .env.local
     environment:
       - APP_DOMAIN=egommerce.local
-      # - APP_PORT=48443
+      # - APP_PORT=40056
     ports:
-      - target: 443
+      - '40056:443'
-        published: 48443
+      - '40057:8080'
-        mode: host
+      - '5672:5672'
-      - target: 8080
-        published: 48444
-        mode: host
-      # - 48443:443
-      # - 48444:8080
-      # - 5672:5672
   
   api-registry:
-    command: ["-ui-content-path=/registry"]
+    command: ["-ui-content-path=/registry", "-log-level=DEBUG"]
-    env_file: .env.local
     environment:
       - APP_DOMAIN=registry.egommerce.local
-      # - APP_PORT=48445
+      # - APP_PORT=40058
     ports:
-      - target: 8500
+      - '8300:8300'
-        published: 48445
+      - '40058:8500'
-        mode: host
+      - '8600:8600/udp'
-      # - 48445:8500
-      # - 8600:8600/udp
 
   api-eventbus:
     env_file: .env.local
     environment:
       - APP_DOMAIN=eventbus.egommerce.local
-      # - APP_PORT=48446
+      # - APP_PORT=40059
     labels:
       - traefik.enable=true
       - traefik.tcp.routers.eventbus.rule=HostSNI(`*`)
@@ -42,8 +33,8 @@ services:
       - traefik.tcp.routers.eventbus.service=eventbus
       - traefik.tcp.services.eventbus.loadbalancer.server.port=5672
     ports:
-      - 48446:8084
+      - '40059:8084'
-      - 15672:15672
+      - '15672:15672'
   
   api-cache:
     env_file: .env.local

deploy/egommerce-stack.dev.yml

@@ -5,8 +5,6 @@ services:
     image: git.pbiernat.dev/egommerce/api-gateway:dev
     environment:
       - APP_DOMAIN=api-gateway
-    volumes:
-      - ./certs/api-gateway:/etc/traefik/certs
 
   api-registry:
     image: git.pbiernat.dev/egommerce/api-registry:dev

deploy/nginx-mikrus.dev.conf

@@ -0,0 +1,111 @@
+upstream egommerce-api-gw {
+        server 127.0.0.1:40056;
+}
+
+upstream egommerce-api-gw-dashboard {
+	server 127.0.0.1:40057;
+}
+
+upstream egommerce-api-registry-ui {
+        server 127.0.0.1:40058;
+}
+
+upstream egommerce-api-eventbus-mngmt {
+        server 127.0.0.1:40059;
+}
+
+server {
+        listen [2a01:4f9:3a:2910::271]:20271 ssl;
+        ssl_certificate     /home/keedosn/egommerce/deploy/certs/api-gateway/gateway.cert;
+        ssl_certificate_key /home/keedosn/egommerce/deploy/certs/api-gateway/gateway.key;
+
+        server_name keshop.bieda.it;
+
+	# Traefik redirects
+        location /dashboard {
+                if ($http_referer ~ (/gateway)) {
+                        proxy_pass http://egommerce-api-gw-dashboard;
+                }
+        }
+        location /api {
+                if ($http_referer ~ (/gateway)) {
+                        proxy_pass http://egommerce-api-gw-dashboard;
+                }
+        }
+
+        location /gateway/ {
+                proxy_pass                         http://egommerce-api-gw-dashboard/dashboard/;
+                proxy_pass_header                  Server;
+                proxy_set_header Host              $host;
+                proxy_set_header X-Real-IP         $remote_addr;
+                proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Proto $scheme;
+                client_max_body_size 0;
+        }
+
+	# Consul redirects
+        location /ui {
+                if ($http_referer ~ (/registry)) {
+                    proxy_pass http://egommerce-api-registry-ui;
+                }
+        }
+
+        location /v1 {
+                if ($http_referer ~ (/registry)) {
+                    proxy_pass http://egommerce-api-registry-ui;
+                }
+        }
+
+        location /registry {
+                proxy_pass                         http://egommerce-api-registry-ui;
+		proxy_http_version                 1.1;
+                proxy_pass_header                  Server;
+                proxy_set_header Host              $host;
+                proxy_set_header X-Real-IP         $remote_addr;
+                proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Proto $scheme;
+                client_max_body_size 0;
+        }
+
+
+        # RabbitMQ Mngmt redirects
+        location /eventbus {
+                return 302 /eventbus/;
+        }
+        location ~* /eventbus/api/(.*?)/(.*) {
+                proxy_pass http://egommerce-api-eventbus-mngmt/api/$1/%2F/$2?$query_string;
+		proxy_http_version                 1.1;
+                proxy_buffering                    off;
+                proxy_pass_header                  Server;
+                proxy_set_header Host              $host;
+                proxy_set_header X-Real-IP         $remote_addr;
+                proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Proto $scheme;
+        }
+        location ~* /eventbus/(.*) {
+                rewrite ^/eventbus/(.*)$ /$1 break;
+                proxy_pass http://egommerce-api-eventbus-mngmt;
+		proxy_http_version                 1.1;
+                proxy_buffering                    off;
+                proxy_pass_header                  Server;
+                proxy_set_header Host              $host;
+                proxy_set_header X-Real-IP         $remote_addr;
+                proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+        # Pass all requests to the API Gateway
+	location / {
+		proxy_pass https://egommerce-api-gw;
+		proxy_http_version                 1.1;
+		proxy_pass_header                  Server;
+		proxy_set_header Host              $host;
+		proxy_set_header X-Real-IP         $remote_addr;
+		proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto $scheme;
+               client_max_body_size 0;
+	}
+
+        error_log /var/log/nginx/keshop.bieda.it-error.log;
+        access_log /var/log/nginx/keshop.bieda.it-access.log combined;
+}

deploy/nginx-vhost.dev.conf

@@ -58,6 +58,7 @@ server {
 
         location /registry {
                 proxy_pass                         http://egommerce-api-registry-ui;
+		proxy_http_version                 1.1;
                 proxy_pass_header                  Server;
                 proxy_set_header Host              $host;
                 proxy_set_header X-Real-IP         $remote_addr;
@@ -73,6 +74,7 @@ server {
         }
         location ~* /eventbus/api/(.*?)/(.*) {
                 proxy_pass http://egommerce-api-eventbus-mngmt/api/$1/%2F/$2?$query_string;
+		proxy_http_version                 1.1;
                 proxy_buffering                    off;
                 proxy_pass_header                  Server;
                 proxy_set_header Host              $host;
@@ -83,6 +85,7 @@ server {
         location ~* /eventbus/(.*) {
                 rewrite ^/eventbus/(.*)$ /$1 break;
                 proxy_pass http://egommerce-api-eventbus-mngmt;
+		proxy_http_version                 1.1;
                 proxy_buffering                    off;
                 proxy_pass_header                  Server;
                 proxy_set_header Host              $host;
@@ -91,6 +94,18 @@ server {
                 proxy_set_header X-Forwarded-Proto $scheme;
         }
 
+        # Pass all requests to the API Gateway
+	location / {
+		proxy_pass https://egommerce-api-gw;
+		proxy_http_version                 1.1;
+		proxy_pass_header                  Server;
+		proxy_set_header Host              $host;
+		proxy_set_header X-Real-IP         $remote_addr;
+		proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto $scheme;
+                client_max_body_size 0;
+	}
+
         error_log /var/log/nginx/admin-egommerce.pbiernat.dev-error.log;
         access_log /var/log/nginx/admin-egommerce.pbiernat.dev-access.log combined;
 }
@@ -102,17 +117,7 @@ server {
 #
 #        server_name egommerce.pbiernat.dev;
 #
-#	# Pass all requests to the API Gateway
+#	
-#	location / {
-#		proxy_pass https://egommerce-api-gw;
-#		proxy_http_version                 1.1;
-#		proxy_pass_header                  Server;
-#		proxy_set_header Host              $host;
-#		proxy_set_header X-Real-IP         $remote_addr;
-#		proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
-#		proxy_set_header X-Forwarded-Proto $scheme;
-#                client_max_body_size 0;
-#	}
 #
 #	error_log /var/log/nginx/egommerce.pbiernat.dev-error.log;
 #	access_log /var/log/nginx/egommerce.pbiernat.dev-access.log combined;

deploy/nginx-vhost.local.conf

@@ -1,17 +1,17 @@
 upstream egommerce-api-gw {
-        server 127.0.0.1:48443;
+        server 127.0.0.1:40056;
 }
 
 upstream egommerce-api-gw-dashboard {
-	server 127.0.0.1:48444;
+	server 127.0.0.1:40057;
 }
 
 upstream egommerce-api-registry-ui {
-        server 127.0.0.1:48445;
+        server 127.0.0.1:40058;
 }
 
 upstream egommerce-api-eventbus-mngmt {
-        server 127.0.0.1:48446;
+        server 127.0.0.1:40059;
 }
 
 server {