diff --git a/default.conf b/default.conf index 00cbe9b..869320d 100644 --- a/default.conf +++ b/default.conf @@ -1,58 +1,67 @@ -# Map hostnames to ports map $host $target_port { default 80; ui.host.jeyerp.az 5000; jeydev-code.host.jeyerp.az 1710; erpnext-ali-code.host.jeyerp.az 1710; git.host.jeyerp.az 3000; - dev.host.jeyerp.az 8000; + dev.host.jeyerp.az 1710; cicd.host.jeyerp.az 8000; } -# Map hosts that require WebSocket upgrade headers -map $host $upgrade_header { - default ""; - jeydev-code.host.jeyerp.az $http_upgrade; - erpnext-ali-code.host.jeyerp.az $http_upgrade; -} - -map $host $connection_header { - default ""; - jeydev-code.host.jeyerp.az "upgrade"; - erpnext-ali-code.host.jeyerp.az "upgrade"; -} - -# Map hostnames to container names (special cases) map $host $container { erpnext-ali-code.host.jeyerp.az erpnext-ali; jeydev-code.host.jeyerp.az jeydev; git.host.jeyerp.az jeyerp-git; dev.host.jeyerp.az jeyerp-dev; cicd.host.jeyerp.az jeyerp-cicd; - ~^(.+)\.host\.jeyerp\.az$ $1; + ~^([^.]+)\.host\.jeyerp\.az$ $1; default ""; } +server { + listen 80; + server_name *.host.jeyerp.az; + + resolver 10.220.187.1 valid=10s; + + location /api/ { + proxy_pass http://$container.incus:$target_port; + 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 / { + return 301 https://$host$request_uri; + } +} + server { listen 443 ssl; server_name *.host.jeyerp.az; ssl_certificate /etc/letsencrypt/live/host.jeyerp.az/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/host.jeyerp.az/privkey.pem; + ssl_client_certificate /etc/nginx/ca/ca.crt; + ssl_verify_client optional; + ssl_verify_depth 1; + + client_max_body_size 50m; resolver 10.220.187.1 valid=10s; location / { - proxy_pass http://$container.incus:$target_port$request_uri; - + proxy_pass http://$container.incus:$target_port; 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_http_version 1.1; - proxy_set_header Upgrade $upgrade_header; - proxy_set_header Connection $connection_header; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_read_timeout 3600s; + proxy_send_timeout 3600s; proxy_redirect off; } @@ -60,20 +69,17 @@ server { server { listen 443 ssl; - server_name monitoring.host.jeyerp.az; + server_name monitoring.host.jeyerp.az; ssl_certificate /etc/letsencrypt/live/host.jeyerp.az/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/host.jeyerp.az/privkey.pem; + ssl_client_certificate /etc/nginx/ca/ca.crt; + ssl_verify_client off; location / { proxy_pass http://192.168.1.1:19999; - - 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_http_version 1.1; - proxy_redirect off; + proxy_set_header Connection ""; } -} \ No newline at end of file +}