From a756cfd6f92afb268c7d57e8406f1cd513ec8897 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Wed, 11 Oct 2023 21:50:12 -0700 Subject: [PATCH] fix for error pages by splitting error_page and location directives, delete nextcloud --- sites/homepage.conf | 1 + sites/ldap.conf | 1 + sites/nextcloud.conf | 9 --------- sites/opns.conf | 1 + sites/paas.conf | 8 ++++---- sites/root.conf | 1 + sites/status.conf | 1 + sites/wiki.conf | 1 + snippets/error-location.conf | 15 --------------- snippets/error-pages.conf | 19 ++++--------------- snippets/proxy-errors.conf | 9 +++++++++ 11 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 sites/nextcloud.conf delete mode 100644 snippets/error-location.conf create mode 100644 snippets/proxy-errors.conf diff --git a/sites/homepage.conf b/sites/homepage.conf index 248e966..3e96630 100644 --- a/sites/homepage.conf +++ b/sites/homepage.conf @@ -2,6 +2,7 @@ server { listen 443 ssl http2; server_name tronnet.net; include /etc/nginx/snippets/ssl-acme.conf; + include /etc/nginx/snippets/proxy-errors.conf; include /etc/nginx/snippets/error-pages.conf; location / { proxy_pass http://sites.dmz:80; diff --git a/sites/ldap.conf b/sites/ldap.conf index 09d8c7a..d1db720 100644 --- a/sites/ldap.conf +++ b/sites/ldap.conf @@ -2,6 +2,7 @@ server { listen 443 ssl http2; server_name ldap.tronnet.net; include /etc/nginx/snippets/ssl-acme.conf; + include /etc/nginx/snippets/proxy-errors.conf; include /etc/nginx/snippets/error-pages.conf; location / { proxy_pass http://ldap.dmz:80; diff --git a/sites/nextcloud.conf b/sites/nextcloud.conf deleted file mode 100644 index f80ac54..0000000 --- a/sites/nextcloud.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 443 ssl http2; - server_name nextcloud.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; - #location / { - # proxy_pass http://nextcloud2.dmz:11000; - # proxy_redirect default; - #} -} diff --git a/sites/opns.conf b/sites/opns.conf index d4f33cb..bddd796 100644 --- a/sites/opns.conf +++ b/sites/opns.conf @@ -2,6 +2,7 @@ server { listen 443 ssl http2; server_name opns.tronnet.net; include /etc/nginx/snippets/ssl-acme.conf; + include /etc/nginx/snippets/proxy-errors.conf; include /etc/nginx/snippets/error-pages.conf; location / { proxy_pass https://10.0.0.1:10443; diff --git a/sites/paas.conf b/sites/paas.conf index 0e2c792..f1a66c2 100644 --- a/sites/paas.conf +++ b/sites/paas.conf @@ -2,8 +2,9 @@ server { listen 443 ssl http2; server_name paas.tronnet.net; include /etc/nginx/snippets/ssl-acme.conf; + include /etc/nginx/snippets/error-pages.conf; location /dashboard/ { - include /etc/nginx/snippets/error-pages.conf; + include /etc/nginx/snippets/proxy-errors.conf; proxy_pass http://proxmoxaas.dmz:8080/; proxy_redirect default; } @@ -12,7 +13,6 @@ server { proxy_redirect default; } location = / { - return 301 "/dashboard/"; - } - include /etc/nginx/snippets/error-location.conf; + return 301 "/dashboard/"; + } } diff --git a/sites/root.conf b/sites/root.conf index c53743c..debbe7b 100644 --- a/sites/root.conf +++ b/sites/root.conf @@ -2,6 +2,7 @@ server { listen 443 ssl http2; server_name root.tronnet.net; include /etc/nginx/snippets/ssl-acme.conf; + include /etc/nginx/snippets/proxy-errors.conf; include /etc/nginx/snippets/error-pages.conf; location / { proxy_pass http://root.root:80; diff --git a/sites/status.conf b/sites/status.conf index 2e4e797..7cefe28 100644 --- a/sites/status.conf +++ b/sites/status.conf @@ -2,6 +2,7 @@ server { listen 443 ssl http2; server_name status.tronnet.net; include /etc/nginx/snippets/ssl-acme.conf; + include /etc/nginx/snippets/proxy-errors.conf; include /etc/nginx/snippets/error-pages.conf; location / { proxy_pass http://sites.dmz:8080; diff --git a/sites/wiki.conf b/sites/wiki.conf index 94bdf87..9a7595f 100644 --- a/sites/wiki.conf +++ b/sites/wiki.conf @@ -2,6 +2,7 @@ server { listen 443 ssl http2; server_name wiki.tronnet.net; include /etc/nginx/snippets/ssl-acme.conf; + include /etc/nginx/snippets/proxy-errors.conf; include /etc/nginx/snippets/error-pages.conf; location / { proxy_pass http://sites.dmz:8081; diff --git a/snippets/error-location.conf b/snippets/error-location.conf deleted file mode 100644 index 9554358..0000000 --- a/snippets/error-location.conf +++ /dev/null @@ -1,15 +0,0 @@ -#proxy_intercept_errors on; - -#error_page 400 /ErrorPages/HTTP400.html; -#error_page 401 /ErrorPages/HTTP401.html; -#error_page 403 /ErrorPages/HTTP403.html; -#error_page 404 /ErrorPages/HTTP404.html; -#error_page 500 /ErrorPages/HTTP500.html; -#error_page 501 /ErrorPages/HTTP501.html; -#error_page 502 /ErrorPages/HTTP502.html; -#error_page 503 /ErrorPages/HTTP503.html; - -location /ErrorPages/ { - alias /var/www/html/ErrorPages/; - internal; -} diff --git a/snippets/error-pages.conf b/snippets/error-pages.conf index 8ea5d2b..2058c0e 100644 --- a/snippets/error-pages.conf +++ b/snippets/error-pages.conf @@ -1,15 +1,4 @@ -proxy_intercept_errors on; - -error_page 400 /ErrorPages/HTTP400.html; -error_page 401 /ErrorPages/HTTP401.html; -error_page 403 /ErrorPages/HTTP403.html; -error_page 404 /ErrorPages/HTTP404.html; -error_page 500 /ErrorPages/HTTP500.html; -error_page 501 /ErrorPages/HTTP501.html; -error_page 502 /ErrorPages/HTTP502.html; -error_page 503 /ErrorPages/HTTP503.html; - -#location /ErrorPages/ { -# alias /var/www/html/ErrorPages/; -# internal; -#} +location /ErrorPages/ { + alias /var/www/html/ErrorPages/; + internal; +} diff --git a/snippets/proxy-errors.conf b/snippets/proxy-errors.conf new file mode 100644 index 0000000..8c4c12f --- /dev/null +++ b/snippets/proxy-errors.conf @@ -0,0 +1,9 @@ +proxy_intercept_errors on; +error_page 400 /ErrorPages/HTTP400.html; +error_page 401 /ErrorPages/HTTP401.html; +error_page 403 /ErrorPages/HTTP403.html; +error_page 404 /ErrorPages/HTTP404.html; +error_page 500 /ErrorPages/HTTP500.html; +error_page 501 /ErrorPages/HTTP501.html; +error_page 502 /ErrorPages/HTTP502.html; +error_page 503 /ErrorPages/HTTP503.html; \ No newline at end of file