From 657a3d18573061d3c3d1649115697c736c2e59e1 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Tue, 5 Mar 2024 23:04:11 -0500 Subject: [PATCH 1/6] Reverse Proxy api automatically test --- .github/workflows/docker-image-dev.yml | 2 +- Dockerfile | 3 +- Website/apiConnector.js | 10 +-- nginx/conf.d/tranga.conf | 49 +++++++++++++ nginx/fastcgi.conf | 26 +++++++ nginx/fastcgi_params | 25 +++++++ nginx/mimes.types | 99 ++++++++++++++++++++++++++ nginx/nginx.conf | 32 +++++++++ nginx/scgi_params | 17 +++++ nginx/uwsgi_params | 17 +++++ 10 files changed, 273 insertions(+), 7 deletions(-) create mode 100644 nginx/conf.d/tranga.conf create mode 100644 nginx/fastcgi.conf create mode 100644 nginx/fastcgi_params create mode 100644 nginx/mimes.types create mode 100644 nginx/nginx.conf create mode 100644 nginx/scgi_params create mode 100644 nginx/uwsgi_params diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml index 2bed583..d88b2db 100644 --- a/.github/workflows/docker-image-dev.yml +++ b/.github/workflows/docker-image-dev.yml @@ -37,7 +37,7 @@ jobs: - name: Build and push Website uses: docker/build-push-action@v4.1.1 with: - context: ./Website + context: ./ file: ./Dockerfile #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 platforms: linux/amd64 diff --git a/Dockerfile b/Dockerfile index d178671..6f11182 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM nginx:alpine3.17-slim -COPY . /usr/share/nginx/html +COPY ./Website /usr/share/nginx/html +COPY ./nginx /etc/nginx EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/Website/apiConnector.js b/Website/apiConnector.js index 64dca93..be5f878 100644 --- a/Website/apiConnector.js +++ b/Website/apiConnector.js @@ -1,9 +1,9 @@ -let apiUri = `${window.location.protocol}//${window.location.host.split(':')[0]}:6531` +let apiUri = `${window.location.protocol}//${window.location.host}/api` -if(getCookie("apiUri") != ""){ - apiUri = getCookie("apiUri"); -} -setCookie("apiUri", apiUri); +// if(getCookie("apiUri") != ""){ +// apiUri = getCookie("apiUri"); +// } +// setCookie("apiUri", apiUri); function setCookie(cname, cvalue) { const d = new Date(); diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf new file mode 100644 index 0000000..bd8a797 --- /dev/null +++ b/nginx/conf.d/tranga.conf @@ -0,0 +1,49 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + location /api/ { + proxy_pass_request_headers on; + proxy_pass http://tranga-api:6531/ + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} \ No newline at end of file diff --git a/nginx/fastcgi.conf b/nginx/fastcgi.conf new file mode 100644 index 0000000..d94b57f --- /dev/null +++ b/nginx/fastcgi.conf @@ -0,0 +1,26 @@ + +fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; \ No newline at end of file diff --git a/nginx/fastcgi_params b/nginx/fastcgi_params new file mode 100644 index 0000000..4a4c037 --- /dev/null +++ b/nginx/fastcgi_params @@ -0,0 +1,25 @@ + +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200 \ No newline at end of file diff --git a/nginx/mimes.types b/nginx/mimes.types new file mode 100644 index 0000000..16191d8 --- /dev/null +++ b/nginx/mimes.types @@ -0,0 +1,99 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/avif avif; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 0000000..94cdc0b --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,32 @@ + +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} \ No newline at end of file diff --git a/nginx/scgi_params b/nginx/scgi_params new file mode 100644 index 0000000..1d56c8b --- /dev/null +++ b/nginx/scgi_params @@ -0,0 +1,17 @@ + +scgi_param REQUEST_METHOD $request_method; +scgi_param REQUEST_URI $request_uri; +scgi_param QUERY_STRING $query_string; +scgi_param CONTENT_TYPE $content_type; + +scgi_param DOCUMENT_URI $document_uri; +scgi_param DOCUMENT_ROOT $document_root; +scgi_param SCGI 1; +scgi_param SERVER_PROTOCOL $server_protocol; +scgi_param REQUEST_SCHEME $scheme; +scgi_param HTTPS $https if_not_empty; + +scgi_param REMOTE_ADDR $remote_addr; +scgi_param REMOTE_PORT $remote_port; +scgi_param SERVER_PORT $server_port; +scgi_param SERVER_NAME $server_name; \ No newline at end of file diff --git a/nginx/uwsgi_params b/nginx/uwsgi_params new file mode 100644 index 0000000..e42d9a9 --- /dev/null +++ b/nginx/uwsgi_params @@ -0,0 +1,17 @@ + +uwsgi_param QUERY_STRING $query_string; +uwsgi_param REQUEST_METHOD $request_method; +uwsgi_param CONTENT_TYPE $content_type; +uwsgi_param CONTENT_LENGTH $content_length; + +uwsgi_param REQUEST_URI $request_uri; +uwsgi_param PATH_INFO $document_uri; +uwsgi_param DOCUMENT_ROOT $document_root; +uwsgi_param SERVER_PROTOCOL $server_protocol; +uwsgi_param REQUEST_SCHEME $scheme; +uwsgi_param HTTPS $https if_not_empty; + +uwsgi_param REMOTE_ADDR $remote_addr; +uwsgi_param REMOTE_PORT $remote_port; +uwsgi_param SERVER_PORT $server_port; +uwsgi_param SERVER_NAME $server_name; \ No newline at end of file From 4b86cd71046ca00393b66d6f301bf73bf2016ea0 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Tue, 5 Mar 2024 23:09:17 -0500 Subject: [PATCH 2/6] A little fucking semi-colon --- nginx/conf.d/tranga.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf index bd8a797..89341d6 100644 --- a/nginx/conf.d/tranga.conf +++ b/nginx/conf.d/tranga.conf @@ -12,7 +12,7 @@ server { location /api/ { proxy_pass_request_headers on; - proxy_pass http://tranga-api:6531/ + proxy_pass http://tranga-api:6531/; } #error_page 404 /404.html; From ef5524d7b65649546441563b62a64f8610ea73b2 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Tue, 5 Mar 2024 23:53:46 -0500 Subject: [PATCH 3/6] conf tweaks --- nginx/conf.d/tranga.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf index 89341d6..3a9dffb 100644 --- a/nginx/conf.d/tranga.conf +++ b/nginx/conf.d/tranga.conf @@ -10,7 +10,7 @@ server { index index.html index.htm; } - location /api/ { + location ~ /api/ { proxy_pass_request_headers on; proxy_pass http://tranga-api:6531/; } From d05b8ea76b42f4a29749c4ef87382388e30b4ecf Mon Sep 17 00:00:00 2001 From: db-2001 Date: Wed, 6 Mar 2024 00:06:16 -0500 Subject: [PATCH 4/6] more conf tweaks --- nginx/conf.d/tranga.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf index 3a9dffb..fc02585 100644 --- a/nginx/conf.d/tranga.conf +++ b/nginx/conf.d/tranga.conf @@ -12,7 +12,10 @@ server { location ~ /api/ { proxy_pass_request_headers on; - proxy_pass http://tranga-api:6531/; + set $upstream_app tranga-api; + set $upstream_port 6531; + set $upstream_proto http: + proxy_pass $upstream_proto://$upstream_app:$upstream_port; } #error_page 404 /404.html; From a2e0a2375a1f85d60b88bb67c522b2711d98713f Mon Sep 17 00:00:00 2001 From: db-2001 Date: Wed, 6 Mar 2024 00:10:33 -0500 Subject: [PATCH 5/6] another freaking semicolon mistake --- nginx/conf.d/tranga.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf index fc02585..fbc3270 100644 --- a/nginx/conf.d/tranga.conf +++ b/nginx/conf.d/tranga.conf @@ -14,7 +14,7 @@ server { proxy_pass_request_headers on; set $upstream_app tranga-api; set $upstream_port 6531; - set $upstream_proto http: + set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; } From 5af30051793849fa17846be69245d90398dc56e3 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 7 Mar 2024 12:16:19 +1100 Subject: [PATCH 6/6] feat: enable API_URL in Dockerfile fix tranga.conf not redirecting /api/ requests --- Dockerfile | 1 + nginx/conf.d/tranga.conf | 52 --------------------------- nginx/templates/default.conf.template | 29 +++++++++++++++ 3 files changed, 30 insertions(+), 52 deletions(-) delete mode 100644 nginx/conf.d/tranga.conf create mode 100644 nginx/templates/default.conf.template diff --git a/Dockerfile b/Dockerfile index 6f11182..9a9592a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,5 @@ COPY ./Website /usr/share/nginx/html COPY ./nginx /etc/nginx EXPOSE 80 +ENV API_URL=http://tranga-api:6531 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf deleted file mode 100644 index fbc3270..0000000 --- a/nginx/conf.d/tranga.conf +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name localhost; - - #access_log /var/log/nginx/host.access.log main; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - location ~ /api/ { - proxy_pass_request_headers on; - set $upstream_app tranga-api; - set $upstream_port 6531; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - } - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} -} \ No newline at end of file diff --git a/nginx/templates/default.conf.template b/nginx/templates/default.conf.template new file mode 100644 index 0000000..cf526c7 --- /dev/null +++ b/nginx/templates/default.conf.template @@ -0,0 +1,29 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + http2 on; + + server_name _; + + access_log /dev/stdout main; + error_log /dev/stderr; + + location /api/ { + proxy_pass_request_headers on; + rewrite ^/api/(.*)$ /$1 break; + proxy_pass $API_URL; + } + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} \ No newline at end of file