diff --git a/root/defaults/nginx/error_pages.conf.sample b/root/defaults/nginx/error_pages.conf.sample deleted file mode 100644 index 85820d0..0000000 --- a/root/defaults/nginx/error_pages.conf.sample +++ /dev/null @@ -1,6 +0,0 @@ -## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/error_pages.conf.sample - -error_page 502 = @lsio_error_502; -location @lsio_error_502 { - alias /config/www/502.html; -} diff --git a/root/defaults/nginx/proxy.conf.sample b/root/defaults/nginx/proxy.conf.sample index 2598231..c5a7210 100644 --- a/root/defaults/nginx/proxy.conf.sample +++ b/root/defaults/nginx/proxy.conf.sample @@ -1,6 +1,4 @@ -## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/proxy.conf.sample - -include /config/nginx/error_pages.conf; +## Version 2022/09/01 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/proxy.conf.sample # Timeout if the real server is dead proxy_next_upstream error timeout invalid_header http_500 http_502 http_503; diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index b648011..37f41e5 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,6 +1,4 @@ -## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample - -include /config/nginx/error_pages.conf; +## Version 2022/09/01 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample # redirect all traffic to https server { @@ -22,8 +20,6 @@ server { root /config/www; index index.html index.htm index.php; - include /config/nginx/error_pages.conf; - # enable subfolder method reverse proxy confs include /config/nginx/proxy-confs/*.subfolder.conf; diff --git a/root/defaults/www/502.html b/root/defaults/www/502.html deleted file mode 100644 index 6e33c60..0000000 --- a/root/defaults/www/502.html +++ /dev/null @@ -1,44 +0,0 @@ - - - 502 - - - -
-

502

-

Nginx can not connect to the application

-

Some common reasons are listed here: docs.linuxserver.io

-

For help and support, please visit: linuxserver.io/support

-
- - diff --git a/root/etc/cont-init.d/45-nginx b/root/etc/cont-init.d/45-nginx index 942d185..ad50d48 100644 --- a/root/etc/cont-init.d/45-nginx +++ b/root/etc/cont-init.d/45-nginx @@ -7,6 +7,3 @@ fi if [[ ! -f /config/nginx/proxy.conf ]]; then cp /defaults/nginx/proxy.conf.sample /config/nginx/proxy.conf fi -if [[ ! -f /config/www/502.html ]]; then - cp /defaults/www/502.html /config/www/502.html -fi diff --git a/root/etc/cont-init.d/70-outdated b/root/etc/cont-init.d/70-outdated index f53e6bd..d1591c1 100644 --- a/root/etc/cont-init.d/70-outdated +++ b/root/etc/cont-init.d/70-outdated @@ -1,9 +1,5 @@ #!/usr/bin/with-contenv bash -if [[ -f /config/nginx/502.conf ]]; then - echo "/config/nginx/502.conf exists. - Please migrate to error_pages.conf" -fi if [[ -f /config/nginx/geoip2.conf ]]; then echo "/config/nginx/geoip2.conf exists. Please migrate to https://github.com/linuxserver/docker-mods/tree/swag-maxmind"