From 805d62549159d2a6b952f2385a324b1c9d26c07d Mon Sep 17 00:00:00 2001 From: bayram-budak Date: Mon, 6 Nov 2023 22:41:36 +0100 Subject: [PATCH 1/3] first attempt at adding ente public --- server/modules/nginx.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/server/modules/nginx.nix b/server/modules/nginx.nix index 6691ba8..47f5075 100644 --- a/server/modules/nginx.nix +++ b/server/modules/nginx.nix @@ -52,6 +52,34 @@ ''; proxyPass = "http://127.0.0.1:8080"; }; + }, + #discord bot for tracking useractivity public version + "activitytracker.site" = { + root = "/data/website"; + forceSSL = true; + enableACME = true; + locations."~* \\.(jpg)$".extraConfig= '' + add_header Access-Control-Allow-Origin *; + ''; + locations."~ ^/(stash|resources|css)".extraConfig='' + client_max_body_size 5000M; + proxy_redirect 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; + proxy_set_header X-NginX-Proxy true; + proxy_pass http://localhost:5092; + ''; + locations."/" = { + tryFiles = "$uri $uri/ /tracker-site/index.html =404"; + }; + locations."/api" = { + extraConfig ='' + rewrite /api/(.*) /$1 break; + ''; + proxyPass = "http://127.0.0.1:8080"; + }; }; "adguard.local" = { locations."/".proxyPass = "http://127.0.0.1:3000"; From 3654bb8d2bc6928e62fe9e87071aed260690d24b Mon Sep 17 00:00:00 2001 From: bayram-budak Date: Wed, 22 Nov 2023 21:24:06 +0100 Subject: [PATCH 2/3] removed server folder --- server/modules/nginx.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 server/modules/nginx.nix diff --git a/server/modules/nginx.nix b/server/modules/nginx.nix deleted file mode 100644 index e69de29..0000000 From 122fa5ee6495d402f048c5331ff5cb202a9d3913 Mon Sep 17 00:00:00 2001 From: bayram-budak Date: Wed, 22 Nov 2023 23:04:05 +0100 Subject: [PATCH 3/3] updated nginx.nix for ente public --- modules/nginx.nix | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/modules/nginx.nix b/modules/nginx.nix index a49ca1f..686c9d5 100644 --- a/modules/nginx.nix +++ b/modules/nginx.nix @@ -53,36 +53,26 @@ proxyPass = "http://127.0.0.1:8080"; }; - #locations."~/books(.*)$" = { + #locations."~/books(.*)$" = { # proxyPass = "http://127.0.0.1:5000"; #}; - }, + }; #discord bot for tracking useractivity public version "activitytracker.site" = { + #serverAliases = [ + # "localhost" + #]; root = "/data/website"; forceSSL = true; enableACME = true; - locations."~* \\.(jpg)$".extraConfig= '' - add_header Access-Control-Allow-Origin *; - ''; - locations."~ ^/(stash|resources|css)".extraConfig='' - client_max_body_size 5000M; - proxy_redirect 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; - proxy_set_header X-NginX-Proxy true; - proxy_pass http://localhost:5092; - ''; - locations."/" = { - tryFiles = "$uri $uri/ /tracker-site/index.html =404"; + locations."/tracker-site-public" = { + tryFiles = "$uri $uri/ /tracker-site-public/index.html =404"; }; locations."/api" = { extraConfig ='' rewrite /api/(.*) /$1 break; ''; - proxyPass = "http://127.0.0.1:8080"; + proxyPass = "http://127.0.0.1:8081"; }; }; "adguard.local" = {