diff --git a/deploy/nginx-vhost.dev-example.conf b/deploy/nginx-vhost.dev-example.conf index 524559f..9a14ec0 100644 --- a/deploy/nginx-vhost.dev-example.conf +++ b/deploy/nginx-vhost.dev-example.conf @@ -16,24 +16,24 @@ upstream egommerce-api-eventbus-mngmt { server { listen 443 ssl; - ssl_certificate /etc/letsencrypt/live/egommerce.pbiernat.dev/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/egommerce.pbiernat.dev/privkey.pem; + ssl_certificate /etc/letsencrypt/live/admin.egommerce.pbiernat.dev/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/admin.egommerce.pbiernat.dev/privkey.pem; - server_name egommerce.pbiernat.dev; + server_name admin.egommerce.pbiernat.dev; # Traefik redirects - location /dashboard { - if ($http_referer ~ (/admin/gateway)) { - proxy_pass http://egommerce-api-gw-dashboard; - } - } - location /api { - if ($http_referer ~ (/admin/gateway)) { - proxy_pass http://egommerce-api-gw-dashboard; - } - } + 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 /admin/gateway/ { + location /gateway/ { proxy_pass http://egommerce-api-gw-dashboard/dashboard/; proxy_pass_header Server; proxy_set_header Host $host; @@ -43,68 +43,78 @@ server { client_max_body_size 0; } - # Consul redirects - location /ui { - if ($http_referer ~ (/admin/registry)) { - proxy_pass http://egommerce-api-registry-ui; - } - } + location /ui { + if ($http_referer ~ (/registry)) { + proxy_pass http://egommerce-api-registry-ui; + } + } - location /v1 { - if ($http_referer ~ (/admin/registry)) { - proxy_pass http://egommerce-api-registry-ui; - } - } + location /v1 { + if ($http_referer ~ (/registry)) { + proxy_pass http://egommerce-api-registry-ui; + } + } - location /admin/registry { - proxy_pass http://egommerce-api-registry-ui; + location /registry { + proxy_pass http://egommerce-api-registry-ui; 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; - } + 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 /admin/eventbus { - return 302 /admin/eventbus/; - } - location ~* /admin/eventbus/api/(.*?)/(.*) { - proxy_pass http://egommerce-api-eventbus-mngmt/api/$1/%2F/$2?$query_string; - proxy_buffering off; + location /eventbus { + return 302 /eventbus/; + } + location ~* /eventbus/api/(.*?)/(.*) { + proxy_pass http://egommerce-api-eventbus-mngmt/api/$1/%2F/$2?$query_string; + 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 ~* /admin/eventbus/(.*) { - rewrite ^/admin/eventbus/(.*)$ /$1 break; - proxy_pass http://egommerce-api-eventbus-mngmt; - proxy_buffering off; + 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_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; - } + 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 other requests to the API Gateway directly - 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; + error_log /var/log/nginx/admin-egommerce.pbiernat.dev-error.log; + access_log /var/log/nginx/admin-egommerce.pbiernat.dev-access.log combined; } +#server { +# listen 443 ssl; +# ssl_certificate /etc/letsencrypt/live/egommerce.pbiernat.dev/fullchain.pem; +# ssl_certificate_key /etc/letsencrypt/live/egommerce.pbiernat.dev/privkey.pem; +# +# 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; +#} +