diff --git a/conf/nginx/site-enabled_aether_app_svelte_node.conf b/conf/nginx/site-enabled_aether_app_svelte_node.conf new file mode 100644 index 0000000..a944461 --- /dev/null +++ b/conf/nginx/site-enabled_aether_app_svelte_node.conf @@ -0,0 +1,139 @@ +server { + listen 80; + listen [::]:80; + + server_name + ${DOCKER_AE_APP_SERVER_NAME} + svelte.localhost demo.localhost dev.localhost + + bak-app.oneskyit.com + bak-connect.oneskyit.com *.bak-connect.oneskyit.com + bak-demo.oneskyit.com *.bak-demo.oneskyit.com + + bak-businessgroup.oneskyit.com *.bak-businessgroup.oneskyit.com + bak-ishlt.oneskyit.com *.bak-ishlt.oneskyit.com + + dev-app.oneskyit.com + dev-connect.oneskyit.com *.dev-connect.oneskyit.com + dev-demo.oneskyit.com *.dev-demo.oneskyit.com + + dev-aacc.oneskyit.com *.dev-aacc.oneskyit.com + dev-aapor.oneskyit.com *.dev-aapor.oneskyit.com + dev-businessgroup.oneskyit.com *.dev-businessgroup.oneskyit.com + dev-chow.oneskyit.com *.dev-chow.oneskyit.com + dev-cmsc.oneskyit.com *.dev-cmsc.oneskyit.com + dev-idaa.oneskyit.com *.dev-idaa.oneskyit.com + dev-ishlt.oneskyit.com *.dev-ishlt.oneskyit.com + dev-lci.oneskyit.com *.dev-lci.oneskyit.com + dev-ncsd.oneskyit.com *.dev-ncsd.oneskyit.com + dev-npa.oneskyit.com *.dev-npa.oneskyit.com + dev-rli.oneskyit.com *.dev-rli.oneskyit.com + + sr-app.oneskyit.com + sr-connect.oneskyit.com *.sr-connect.oneskyit.com + sr-demo.oneskyit.com *.sr-demo.oneskyit.com + + sr-aacc.oneskyit.com *.sr-aacc.oneskyit.com + sr-aapor.oneskyit.com *.sr-aapor.oneskyit.com + sr-businessgroup.oneskyit.com *.sr-businessgroup.oneskyit.com + sr-cmsc.oneskyit.com *.sr-cmsc.oneskyit.com + sr-lci.oneskyit.com *.sr-lci.oneskyit.com + sr-ncsd.oneskyit.com *.sr-ncsd.oneskyit.com + + test-app.oneskyit.com + ; + + access_log /logs/nginx/access_svelte_node.log; + error_log /logs/nginx/error_svelte_node.log; + + client_max_body_size ${OSIT_WEB_MAX_BODY_SIZE}; + + location / { + proxy_set_header Host $http_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_redirect off; + proxy_buffering off; + + proxy_read_timeout 1500s; + + proxy_pass http://svelte_backend; + } +} + + +server { + listen 443 ssl; + listen [::]:443 ssl; + http2 on; + + server_name + ${DOCKER_AE_APP_SERVER_NAME} + svelte.localhost demo.localhost dev.localhost + + bak-app.oneskyit.com + bak-connect.oneskyit.com *.bak-connect.oneskyit.com + bak-demo.oneskyit.com *.bak-demo.oneskyit.com + + bak-businessgroup.oneskyit.com *.bak-businessgroup.oneskyit.com + bak-ishlt.oneskyit.com *.bak-ishlt.oneskyit.com + + dev-app.oneskyit.com + dev-connect.oneskyit.com *.dev-connect.oneskyit.com + dev-demo.oneskyit.com *.dev-demo.oneskyit.com + + dev-aacc.oneskyit.com *.dev-aacc.oneskyit.com + dev-aapor.oneskyit.com *.dev-aapor.oneskyit.com + dev-businessgroup.oneskyit.com *.dev-businessgroup.oneskyit.com + dev-chow.oneskyit.com *.dev-chow.oneskyit.com + dev-idaa.oneskyit.com *.dev-idaa.oneskyit.com + dev-ishlt.oneskyit.com *.dev-ishlt.oneskyit.com + dev-lci.oneskyit.com *.dev-lci.oneskyit.com + dev-npa.oneskyit.com *.dev-npa.oneskyit.com + dev-rli.oneskyit.com *.dev-rli.oneskyit.com + + sr-app.oneskyit.com + sr-connect.oneskyit.com *.sr-connect.oneskyit.com + sr-demo.oneskyit.com *.sr-demo.oneskyit.com + + sr-aacc.oneskyit.com *.sr-aacc.oneskyit.com + sr-aapor.oneskyit.com *.sr-aapor.oneskyit.com + sr-businessgroup.oneskyit.com *.sr-businessgroup.oneskyit.com + sr-lci.oneskyit.com *.sr-lci.oneskyit.com + + test-app.oneskyit.com + ; + + access_log /logs/nginx/access_svelte_node.log; + error_log /logs/nginx/error_svelte_node.log; + + include /etc/nginx/options-ssl-nginx.conf; + + ssl_certificate /etc/certs/fullchain_wild.pem; + ssl_certificate_key /etc/certs/privkey_wild.pem; + ssl_dhparam /etc/certs/ssl-dhparams.pem; + + client_max_body_size ${OSIT_WEB_MAX_BODY_SIZE}; + + location / { + proxy_set_header Host $http_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_redirect off; + proxy_buffering off; + + proxy_read_timeout 1500s; + + proxy_pass http://svelte_backend; + } +} + + +upstream svelte_backend { + ip_hash; + server ae_app:3000 weight=20 max_fails=3 fail_timeout=30s; +} diff --git a/conf/nginx/site-enabled_aether_flask_gunicorn.conf b/conf/nginx/site-enabled_aether_flask_gunicorn.conf index 65e8eb5..85f2518 100644 --- a/conf/nginx/site-enabled_aether_flask_gunicorn.conf +++ b/conf/nginx/site-enabled_aether_flask_gunicorn.conf @@ -162,22 +162,6 @@ server { upstream flask_backend { - # sticky sessions ip_hash; - - # enable least connections balancing method - # least_conn; - - # zone backend 64k; # Use NGINX Plus' shared memory - - # server webserver1 weight=1; - # server webserver2 weight=4; - - # larger number will recieve more requests - # Example of 20 vs 10: 20 will recieve twice as many requests as 10 - server aether_app_gunicorn:5005 weight=20 max_fails=3 fail_timeout=30s; - # server aether_app_gunicorn_bak:5005 weight=10 max_fails=1 fail_timeout=30s; - - # maintain up to 20 idle connections to the group of upstream servers - # keepalive 20; + server app-node:3000 weight=20 max_fails=3 fail_timeout=30s; } diff --git a/docker-compose.yml b/docker-compose.yml index 8578b57..ebbb0eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -143,7 +143,7 @@ services: target: deploy-node args: BUILD_MODE: ${AE_APP_BUILD_MODE:-staging} - scale: 1 + scale: ${AE_APP_REPLICAS:-1} env_file: - ./.env ports: @@ -159,7 +159,7 @@ services: static.oneskyit.com: "104.237.143.4" dev.oneskyit.com: "192.168.32.7" # volumes: - # # In production, the build happens INSIDE the container. + # # In production, the build happens INSIDE the container. # # Mounting the host source here would override the internal build. # # - ${AE_APP_SRC}:/app depends_on: