Nginx config updates

Author: AlphaRecon19

.gitlab-ci.yml

@@ -13,7 +13,7 @@ Build:
     - docker
   script:
     - sed -i "s/ghcr.io/${CI_REGISTRY}/g" Dockerfile
-    - sed -i "s/:master/:latest/g" Dockerfile 
+    - sed -i "s/:master/:latest/g" Dockerfile
     - >
       docker build
       --pull

entrypoint.sh

@@ -15,6 +15,9 @@ CODER_SERVICE=${CODER_SERVICE:-coder}
 PGADMIN_PORT=${PGADMIN_PORT:-80}
 PGADMIN_SERVICE=${PGADMIN_SERVICE:-pgadmin}
 
+MINIO_PORT=${MINIO_PORT:-9000}
+MINIO_SERVICE=${MINIO_SERVICE:-minio}
+
 # Reset the proxy and localhost config
 echo "" > /etc/nginx/proxy.conf
 echo "" > /etc/nginx/localhost.conf

frontend_localhost_service.conf

@@ -1,7 +1,9 @@
 server {
     server_name localhost;
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    http2 on;
 
     add_header X-Content-Type-Options nosniff;
     ssl_protocols TLSv1.2 TLSv1.3;
@@ -23,4 +25,4 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $connection_upgrade;
     }
-}
+}

inject-config

@@ -12,7 +12,6 @@ echo '    proxy_set_header X-Forwarded-Proto https;';
 echo '    proxy_set_header X-Forwarded-Host localhost;';
 echo '    proxy_set_header X-Real-IP $remote_addr;';
 echo '    proxy_redirect off;';
-echo '    proxy_http_version 1.1;';
 echo '}';
 
 echo 'location /ws {';
@@ -24,7 +23,6 @@ echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;';
 echo '    proxy_set_header X-Forwarded-Proto https;';
 echo '    proxy_set_header X-Forwarded-Host localhost;';
 echo '    proxy_set_header X-Real-IP $remote_addr;';
-echo '    proxy_http_version 1.1;';
 echo '    proxy_set_header Upgrade $http_upgrade;';
 echo '    proxy_set_header Connection $connection_upgrade;';
 echo '}';
@@ -46,7 +44,27 @@ echo '    proxy_connect_timeout 1800;';
 echo '    chunked_transfer_encoding on;';
 echo '    proxy_set_header Upgrade $http_upgrade;';
 echo '    proxy_set_header Connection "upgrade";';
-echo '    proxy_http_version 1.1;';
+echo '    proxy_redirect off;';
+echo '    proxy_buffering off;';
+echo '}'
+
+fi
+
+if [ $SERVICE = "minio" ]; then
+
+echo 'location /minio/ {';
+echo '    rewrite /minio/(.*) /$1 break;';
+cat <<END
+    proxy_pass http://$SERVICE:$PORT;
+END
+echo '    proxy_set_header Host $host;';
+echo '    proxy_set_header X-Real-IP $remote_addr;';
+echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;';
+echo '    proxy_read_timeout 1800;';
+echo '    proxy_connect_timeout 1800;';
+echo '    chunked_transfer_encoding on;';
+echo '    proxy_set_header Upgrade $http_upgrade;';
+echo '    proxy_set_header Connection "upgrade";';
 echo '    proxy_redirect off;';
 echo '    proxy_buffering off;';
 echo '}'
@@ -68,7 +86,6 @@ echo "    proxy_set_header Host localhost;";
 echo '    proxy_set_header X-Real-IP $remote_addr;';
 echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;';
 echo '    proxy_set_header X-Forwarded-Host localhost;';
-echo '    proxy_http_version 1.1;';
 echo '    proxy_redirect off;';
 echo '    proxy_buffering off;';
 echo '}'
@@ -87,7 +104,6 @@ echo '
   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 $http_upgrade;
   proxy_set_header Connection "upgrade";
 ';
@@ -108,7 +124,6 @@ echo '
   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 $http_upgrade;
   proxy_set_header Connection "upgrade";
   proxy_set_header X-Script-Name /pgadmin;

nginx.conf

@@ -21,19 +21,21 @@ http {
 
     fastcgi_buffers 16 16k;
     fastcgi_buffer_size 32k;
-    proxy_buffer_size 128k;
+
+    proxy_buffer_size 64k;
     proxy_buffers 4 256k;
     proxy_busy_buffers_size 256k;
 
-    client_body_buffer_size 10K;
-    client_body_timeout 60;
+    client_body_buffer_size 64K;
+    client_body_timeout 10;
     client_header_buffer_size 64k;
     client_header_timeout 60;
     client_max_body_size 100m;
 
     keepalive_timeout 60;
     large_client_header_buffers 4 64k;
     send_timeout 60;
+    proxy_http_version 1.1;
 
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
@@ -78,8 +80,10 @@ http {
     }
 
     server {
-        listen 443 ssl http2;
-        listen [::]:443 ssl http2;
+        listen 443 ssl;
+        listen [::]:443 ssl;
+
+        http2 on;
 
         add_header X-Content-Type-Options nosniff;
         ssl_protocols TLSv1.2;
@@ -106,6 +110,7 @@ http {
             fastcgi_param SCRIPT_FILENAME /var/www/public/index.php;
             fastcgi_param SCRIPT_NAME /index.php;
             fastcgi_param REQUEST_URI /$uri?$args;
+            fastcgi_buffering off;
         }
 
         root /var/www/public;
@@ -124,7 +129,6 @@ http {
 
             location /socketserver {
                 proxy_pass http://websocket_ws;
-                proxy_http_version 1.1;
                 proxy_set_header Upgrade $http_upgrade;
                 proxy_set_header Connection $connection_upgrade;
                 proxy_set_header Host $host;