Infra-Mirrors/docker-swag
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-swag.git synced 2025-01-26 14:35:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove error_pages

Browse Source
This commit is contained in:
Eric Nemchik 2022-09-01 18:34:35 -05:00
parent b2e05fe4de
commit 96f746d5ce
6 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
root/defaults/nginx/error_pages.conf.sample
View File

@ -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;
}

4
root/defaults/nginx/proxy.conf.sample
View File

@ -1,6 +1,4 @@
## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/proxy.conf.sample ## Version 2022/09/01 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/proxy.conf.sample
include /config/nginx/error_pages.conf;
# Timeout if the real server is dead # Timeout if the real server is dead
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503; proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;

6
root/defaults/nginx/site-confs/default.conf.sample
View File

@ -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 ## Version 2022/09/01 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
include /config/nginx/error_pages.conf;
# redirect all traffic to https # redirect all traffic to https
server { server {
@ -22,8 +20,6 @@ server {
root /config/www; root /config/www;
index index.html index.htm index.php; index index.html index.htm index.php;
include /config/nginx/error_pages.conf;
# enable subfolder method reverse proxy confs # enable subfolder method reverse proxy confs
include /config/nginx/proxy-confs/*.subfolder.conf; include /config/nginx/proxy-confs/*.subfolder.conf;

44
root/defaults/www/502.html
View File

@ -1,44 +0,0 @@
<html>
<head>
<title>502</title>
<style>
body{
font-family: Helvetica, Arial, sans-serif;
background-color: #961313;
}
.message{
width:440px;
padding:20px 40px;
margin:0 auto;
background-color:#f9f9f9;
border:1px solid #ddd;
color: #1e3d62;
}
center{
margin:40px 0;
}
h1{
font-size: 28px;
line-height: 26px;
}
h2{
font-size: 18px;
line-height: 26px;
}
p{
font-size: 12px;
}
a{
color: rgb(207, 48, 139);
}
</style>
</head>
<body>
<div class="message">
<h1>502</h1>
<h2>Nginx can not connect to the application</h2>
<p>Some common reasons are listed here: <a target="_blank" href="https://docs.linuxserver.io/general/swag#502">docs.linuxserver.io</a></p>
<p>For help and support, please visit: <a target="_blank" href="https://www.linuxserver.io/support">linuxserver.io/support</a></p>
</div>
</body>
</html>

3
root/etc/cont-init.d/45-nginx
View File

@ -7,6 +7,3 @@ fi
if [[ ! -f /config/nginx/proxy.conf ]]; then if [[ ! -f /config/nginx/proxy.conf ]]; then
cp /defaults/nginx/proxy.conf.sample /config/nginx/proxy.conf cp /defaults/nginx/proxy.conf.sample /config/nginx/proxy.conf
fi fi
if [[ ! -f /config/www/502.html ]]; then
cp /defaults/www/502.html /config/www/502.html
fi

4
root/etc/cont-init.d/70-outdated
View File

@ -1,9 +1,5 @@
#!/usr/bin/with-contenv bash #!/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 if [[ -f /config/nginx/geoip2.conf ]]; then
echo "/config/nginx/geoip2.conf exists. echo "/config/nginx/geoip2.conf exists.
Please migrate to https://github.com/linuxserver/docker-mods/tree/swag-maxmind" Please migrate to https://github.com/linuxserver/docker-mods/tree/swag-maxmind"