From f4438b09a8412938e6dde3d29d12fe009eb6a4a3 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 Nov 2023 01:34:13 +0000 Subject: [PATCH 1/5] feat: add config files for mdwalters --- mdwalters.conf | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 mdwalters.conf diff --git a/mdwalters.conf b/mdwalters.conf new file mode 100644 index 0000000..545e455 --- /dev/null +++ b/mdwalters.conf @@ -0,0 +1,56 @@ +server { + listen 443 ssl; + listen [::]:443 ssl; + server_name ~^(\d)\.mdwalters\.exozy\.me; + + include conf.d/ssl; + + index index.html; + + location / { + # https://serverfault.com/questions/638505/nginx-dynamic-proxy-pass-doesnt-resolve-properly + proxy_pass http://127.0.0.1:420$1; + 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 WebSockets + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + } +} + +server { + listen 443 ssl; + listen [::]:443 ssl; + server_name ~^(?.+)\.exozy\.me; + + include conf.d/ssl; + + root /home/mdwalters/pages/$page; + index index.html; + + error_page 502 404 /404.html; + location = /404.html { + internal; + } + + location / { + try_files $uri $uri.html $uri/ = @fallback; + } + + location @fallback { + proxy_pass http://unix:/home/mdwalters/pages/$page; + 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 WebSockets + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + } +} From f2442f0a081b437cf547ad9437c768770d8c53e2 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 Nov 2023 12:58:45 +0000 Subject: [PATCH 2/5] fix: use the other template --- mdwalters.conf | 51 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/mdwalters.conf b/mdwalters.conf index 545e455..1ba99f9 100644 --- a/mdwalters.conf +++ b/mdwalters.conf @@ -1,56 +1,13 @@ +# example server { listen 443 ssl; listen [::]:443 ssl; - server_name ~^(\d)\.mdwalters\.exozy\.me; - - include conf.d/ssl; + server_name example.mdwalters.exozy.me; + root /srv/http/pages/somefolder; index index.html; location / { - # https://serverfault.com/questions/638505/nginx-dynamic-proxy-pass-doesnt-resolve-properly - proxy_pass http://127.0.0.1:420$1; - 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 WebSockets - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - } -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - server_name ~^(?.+)\.exozy\.me; - - include conf.d/ssl; - - root /home/mdwalters/pages/$page; - index index.html; - - error_page 502 404 /404.html; - location = /404.html { - internal; - } - - location / { - try_files $uri $uri.html $uri/ = @fallback; - } - - location @fallback { - proxy_pass http://unix:/home/mdwalters/pages/$page; - 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 WebSockets - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; + try_files $uri $uri.html $uri/ =404; } } From ce158df2da0271e9fcc8b35b0ef7e0acaba9c92b Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 Nov 2023 17:25:20 +0000 Subject: [PATCH 3/5] feat: add meower line --- mdwalters.conf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mdwalters.conf b/mdwalters.conf index 1ba99f9..9a31414 100644 --- a/mdwalters.conf +++ b/mdwalters.conf @@ -1,11 +1,8 @@ -# example +# meower server { listen 443 ssl; listen [::]:443 ssl; - server_name example.mdwalters.exozy.me; - - root /srv/http/pages/somefolder; - index index.html; + server_name meower.mdwalters.exozy.me; location / { try_files $uri $uri.html $uri/ =404; From f4075ccb1a386637f5dc95bca79acc2ad78f1bc2 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 Nov 2023 19:20:41 +0000 Subject: [PATCH 4/5] Update mdwalters.conf --- mdwalters.conf | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/mdwalters.conf b/mdwalters.conf index 9a31414..960c5c8 100644 --- a/mdwalters.conf +++ b/mdwalters.conf @@ -4,7 +4,19 @@ server { listen [::]:443 ssl; server_name meower.mdwalters.exozy.me; - location / { - try_files $uri $uri.html $uri/ =404; + location /api/ { + proxy_pass http://localhost:1341/; + 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 /ws { + proxy_pass ws://localhost:1342/; + 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; } } From d1c2e9470d3812dd076ff80201c9861a9fc430e3 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 Nov 2023 20:30:22 +0000 Subject: [PATCH 5/5] Update mdwalters.conf --- mdwalters.conf | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mdwalters.conf b/mdwalters.conf index 960c5c8..0d5aa7c 100644 --- a/mdwalters.conf +++ b/mdwalters.conf @@ -4,16 +4,24 @@ server { listen [::]:443 ssl; server_name meower.mdwalters.exozy.me; - location /api/ { - proxy_pass http://localhost:1341/; + location /ws { + proxy_pass ws://127.0.0.1:1341/; 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 /ws { - proxy_pass ws://localhost:1342/; + location /api/ { + proxy_pass http://127.0.0.1:1342/; + 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 / { + proxy_pass https://127.0.0.1:5173/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;