From ad998656e2bde373619c5cd4ec0578034d8548ba Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Tue, 27 Sep 2011 06:59:19 -0400 Subject: [PATCH] - Changed FastCGI buffers for ISPConfig nginx vhost because otherwise you get "upstream sent too big header while reading response header from upstream" on OpenSUSE. - Added 502 error page ("Bad Gateway"). - Added "fastcgi_intercept_errors on;" to nginx vhost template so that ISPConfig's error pages are displayed instead of the default nginx ones. --- server/conf/nginx_vhost.conf.master | 7 server/conf/error/it/502.html | 61 +++ server/conf/error/fi/502.html | 61 +++ server/conf/error/gr/502.html | 61 +++ server/conf/error/br/502.html | 61 +++ server/conf/error/sr/502.html | 61 +++ server/conf/vhost.conf.master | 1 server/conf/error/cz/502.html | 61 +++ server/conf/error/de/502.html | 61 +++ server/conf/error/es/502.html | 61 +++ server/conf/error/pl/502.html | 61 +++ install/tpl/nginx_apps.vhost.master | 7 server/conf/error/hu/502.html | 61 +++ install/tpl/nginx_ispconfig.vhost.master | 10 server/conf/error/si/502.html | 61 +++ server/conf/error/en/502.html | 61 +++ server/conf/error/fr/502.html | 61 +++ server/conf/error/nl/502.html | 61 +++ server/conf/error/se/502.html | 61 +++ server/conf/nginx_apps.vhost.master | 7 20 files changed, 940 insertions(+), 7 deletions(-) diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master index 30416e3..b0bd3a3 100644 --- a/install/tpl/nginx_apps.vhost.master +++ b/install/tpl/nginx_apps.vhost.master @@ -15,11 +15,16 @@ } location ~ \.php$ { + try_files $uri =404; + include /etc/nginx/fastcgi_params; fastcgi_pass 127.0.0.1:{fpm_port}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_script_name; - include /etc/nginx/fastcgi_params; + fastcgi_buffer_size 128k; + fastcgi_buffers 256 4k; + fastcgi_busy_buffers_size 256k; + fastcgi_temp_file_write_size 256k; } location ~ /\. { diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master index 2c9173b..ffaf760 100644 --- a/install/tpl/nginx_ispconfig.vhost.master +++ b/install/tpl/nginx_ispconfig.vhost.master @@ -18,11 +18,15 @@ location ~ \.php$ { try_files $uri =404; + include /etc/nginx/fastcgi_params; fastcgi_pass 127.0.0.1:{fpm_port}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_script_name; - include /etc/nginx/fastcgi_params; + fastcgi_buffer_size 128k; + fastcgi_buffers 256 4k; + fastcgi_busy_buffers_size 256k; + fastcgi_temp_file_write_size 256k; } location ~ /\. { @@ -35,11 +39,11 @@ location ~ ^/phpmyadmin/(.+\.php)$ { try_files $uri =404; root /usr/share/; + include /etc/nginx/fastcgi_params; fastcgi_pass 127.0.0.1:{fpm_port}; {ssl_comment}fastcgi_param HTTPS {fastcgi_ssl}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; } location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { root /usr/share/; @@ -55,11 +59,11 @@ location ~ ^/squirrelmail/(.+\.php)$ { try_files $uri =404; root /usr/share/; + include /etc/nginx/fastcgi_params; fastcgi_pass 127.0.0.1:{fpm_port}; {ssl_comment}fastcgi_param HTTPS {fastcgi_ssl}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; } location ~* ^/squirrelmail/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { root /usr/share/; diff --git a/server/conf/error/br/502.html b/server/conf/error/br/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/br/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/cz/502.html b/server/conf/error/cz/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/cz/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/de/502.html b/server/conf/error/de/502.html new file mode 100644 index 0000000..1d7afb3 --- /dev/null +++ b/server/conf/error/de/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>FEHLER 502 - Fehlerhaftes Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>FEHLER 502 - Fehlerhaftes Gateway!</h1> + </div> + <div id="content"> + <h2>Folgender Fehler ist aufgetreten:</h2> + <p>Dieser Server hat eine ungültige Antwort von einem Upstream-Server erhalten, auf den zugegriffen wurde, um die Anforderung zu erfüllen. </p> + <P>Sollten Sie diese Fehlermeldung öfter erhalten, wenden Sie sich bitte an den <!--WEBMASTER//-->Webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/en/502.html b/server/conf/error/en/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/en/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/es/502.html b/server/conf/error/es/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/es/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/fi/502.html b/server/conf/error/fi/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/fi/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/fr/502.html b/server/conf/error/fr/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/fr/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/gr/502.html b/server/conf/error/gr/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/gr/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/hu/502.html b/server/conf/error/hu/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/hu/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/it/502.html b/server/conf/error/it/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/it/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/nl/502.html b/server/conf/error/nl/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/nl/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/pl/502.html b/server/conf/error/pl/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/pl/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/se/502.html b/server/conf/error/se/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/se/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/si/502.html b/server/conf/error/si/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/si/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/error/sr/502.html b/server/conf/error/sr/502.html new file mode 100644 index 0000000..62a1b02 --- /dev/null +++ b/server/conf/error/sr/502.html @@ -0,0 +1,61 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <title>ERROR 502 - Bad Gateway!</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="robots" content="noindex" /> + <style type="text/css"><!-- + body { + color: #444444; + background-color: #EEEEEE; + font-family: 'Trebuchet MS', sans-serif; + font-size: 80%; + } + h1 {} + h2 { font-size: 1.2em; } + #page{ + background-color: #FFFFFF; + width: 60%; + margin: 24px auto; + padding: 12px; + } + #header { + padding: 6px ; + text-align: center; + } + .status3xx { background-color: #475076; color: #FFFFFF; } + .status4xx { background-color: #C55042; color: #FFFFFF; } + .status5xx { background-color: #F2E81A; color: #000000; } + #content { + padding: 4px 0 24px 0; + } + #footer { + color: #666666; + background: #f9f9f9; + padding: 10px 20px; + border-top: 5px #efefef solid; + font-size: 0.8em; + text-align: center; + } + #footer a { + color: #999999; + } + --></style> +</head> +<body> + <div id="page"> + <div id="header" class="status5xx"> + <h1>ERROR 502 - Bad Gateway!</h1> + </div> + <div id="content"> + <h2>The following error occurred:</h2> + <p>This server received an invalid response from an upstream server it accessed to fulfill the request.</p> + <P>If you get this message repeatedly please contact the <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p> + </div> + <div id="footer"> + <p>Powered by <a href="http://www.ispconfig.org">ISPConfig</a></p> + </div> + </div> +</body> +</html> diff --git a/server/conf/nginx_apps.vhost.master b/server/conf/nginx_apps.vhost.master index 30416e3..b0bd3a3 100644 --- a/server/conf/nginx_apps.vhost.master +++ b/server/conf/nginx_apps.vhost.master @@ -15,11 +15,16 @@ } location ~ \.php$ { + try_files $uri =404; + include /etc/nginx/fastcgi_params; fastcgi_pass 127.0.0.1:{fpm_port}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_script_name; - include /etc/nginx/fastcgi_params; + fastcgi_buffer_size 128k; + fastcgi_buffers 256 4k; + fastcgi_busy_buffers_size 256k; + fastcgi_temp_file_write_size 256k; } location ~ /\. { diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master index 53fefbb..fd05731 100644 --- a/server/conf/nginx_vhost.conf.master +++ b/server/conf/nginx_vhost.conf.master @@ -44,6 +44,7 @@ error_page 404 /error/404.html; error_page 405 /error/405.html; error_page 500 /error/500.html; + error_page 502 /error/502.html; error_page 503 /error/503.html; </tmpl_if> @@ -77,6 +78,7 @@ <tmpl_if name='php' op='==' value='fast-cgi'> location ~ \.php$ { try_files $uri =404; + include /etc/nginx/fastcgi_params; <tmpl_if name='use_tcp'> fastcgi_pass 127.0.0.1:<tmpl_var name='fpm_port'>; </tmpl_if> @@ -86,7 +88,7 @@ fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_script_name; - include /etc/nginx/fastcgi_params; + fastcgi_intercept_errors on; } </tmpl_else> location ~ \.php$ { @@ -97,12 +99,13 @@ <tmpl_if name='cgi' op='==' value='y'> location /cgi-bin/ { try_files $uri =404; + include /etc/nginx/fastcgi_params; root <tmpl_var name='document_root'>; gzip off; fastcgi_pass unix:/var/run/fcgiwrap.socket; fastcgi_index index.cgi; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; + fastcgi_intercept_errors on; } </tmpl_if> diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index 5d58923..8ea14b7 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -33,6 +33,7 @@ ErrorDocument 404 /error/404.html ErrorDocument 405 /error/405.html ErrorDocument 500 /error/500.html + ErrorDocument 502 /error/502.html ErrorDocument 503 /error/503.html </tmpl_if> -- Gitblit v1.9.1