From 3e6f67f058392578b93cd09700607252c9e0b071 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Fri, 17 Nov 2017 14:27:51 +0100 Subject: The markup has been optimized to use more semantic

and elements. In addition, the error page for HTTP status code 502 has been added. --- conf-available/errorpage.conf | 2 ++ customization/errorpage/400.shtml | 2 +- customization/errorpage/401.shtml | 2 +- customization/errorpage/403.shtml | 2 +- customization/errorpage/404.shtml | 2 +- customization/errorpage/405.shtml | 2 +- customization/errorpage/408.shtml | 2 +- customization/errorpage/409.shtml | 2 +- customization/errorpage/410.shtml | 2 +- customization/errorpage/411.shtml | 2 +- customization/errorpage/412.shtml | 2 +- customization/errorpage/413.shtml | 2 +- customization/errorpage/414.shtml | 2 +- customization/errorpage/415.shtml | 2 +- customization/errorpage/429.shtml | 4 ++-- customization/errorpage/500.shtml | 2 +- customization/errorpage/501.shtml | 2 +- customization/errorpage/502.shtml | 7 +++++++ customization/errorpage/503.shtml | 2 +- customization/errorpage/504.shtml | 2 +- customization/errorpage/header.shtml | 2 +- 21 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 customization/errorpage/502.shtml diff --git a/conf-available/errorpage.conf b/conf-available/errorpage.conf index 26071e6..314e195 100644 --- a/conf-available/errorpage.conf +++ b/conf-available/errorpage.conf @@ -15,6 +15,7 @@ Alias /errorpage/429 /etc/apache2/customization/errorpage/429.shtml Alias /errorpage/500 /etc/apache2/customization/errorpage/500.shtml Alias /errorpage/501 /etc/apache2/customization/errorpage/501.shtml + Alias /errorpage/502 /etc/apache2/customization/errorpage/502.shtml Alias /errorpage/503 /etc/apache2/customization/errorpage/503.shtml Alias /errorpage/504 /etc/apache2/customization/errorpage/504.shtml @@ -34,6 +35,7 @@ ErrorDocument 429 /errorpage/429 ErrorDocument 500 /errorpage/500 ErrorDocument 501 /errorpage/501 + ErrorDocument 502 /errorpage/502 ErrorDocument 503 /errorpage/503 ErrorDocument 504 /errorpage/504 diff --git a/customization/errorpage/400.shtml b/customization/errorpage/400.shtml index 90e2e15..9fd5525 100644 --- a/customization/errorpage/400.shtml +++ b/customization/errorpage/400.shtml @@ -2,5 +2,5 @@ -

Your browser (or proxy) sent a request that this server could not understand.
+

Your browser (or proxy) sent a request that this server could not understand.

\ No newline at end of file diff --git a/customization/errorpage/401.shtml b/customization/errorpage/401.shtml index d6cfe68..491cacd 100644 --- a/customization/errorpage/401.shtml +++ b/customization/errorpage/401.shtml @@ -2,5 +2,5 @@ -
This server could not verify that you are authorized to access this resource.
+

This server could not verify that you are authorized to access this resource.

\ No newline at end of file diff --git a/customization/errorpage/403.shtml b/customization/errorpage/403.shtml index fb59017..4f9e0c7 100644 --- a/customization/errorpage/403.shtml +++ b/customization/errorpage/403.shtml @@ -2,5 +2,5 @@ -
You don't have permission to access the requested resource.
+

You don't have permission to access the requested resource.

\ No newline at end of file diff --git a/customization/errorpage/404.shtml b/customization/errorpage/404.shtml index 714e4e0..a82707e 100644 --- a/customization/errorpage/404.shtml +++ b/customization/errorpage/404.shtml @@ -2,5 +2,5 @@ -
The requested resource was not found on this server.
+

The requested resource was not found on this server.

\ No newline at end of file diff --git a/customization/errorpage/405.shtml b/customization/errorpage/405.shtml index 2e699cc..32ca2a2 100644 --- a/customization/errorpage/405.shtml +++ b/customization/errorpage/405.shtml @@ -2,5 +2,5 @@ -
The request method, with which the server has been requested is not allowed.
+

The request method, with which the server has been requested is not allowed.

\ No newline at end of file diff --git a/customization/errorpage/408.shtml b/customization/errorpage/408.shtml index 09ed971..4398985 100644 --- a/customization/errorpage/408.shtml +++ b/customization/errorpage/408.shtml @@ -2,5 +2,5 @@ -
The server closed the network connection because the client didn't finish the request within the specified time.
+

The server closed the network connection because the client didn't finish the request within the specified time.

\ No newline at end of file diff --git a/customization/errorpage/409.shtml b/customization/errorpage/409.shtml index c59360c..ef4424e 100644 --- a/customization/errorpage/409.shtml +++ b/customization/errorpage/409.shtml @@ -2,5 +2,5 @@ -
The request could not be completed due to a conflict with the current state of the resource.
+

The request could not be completed due to a conflict with the current state of the resource.

\ No newline at end of file diff --git a/customization/errorpage/410.shtml b/customization/errorpage/410.shtml index ac56756..7340b9b 100644 --- a/customization/errorpage/410.shtml +++ b/customization/errorpage/410.shtml @@ -2,5 +2,5 @@ -
The requested resource is no longer available on this server and there is no forwarding address.
+

The requested resource is no longer available on this server and there is no forwarding address.

\ No newline at end of file diff --git a/customization/errorpage/411.shtml b/customization/errorpage/411.shtml index 253c59e..eb9bb63 100644 --- a/customization/errorpage/411.shtml +++ b/customization/errorpage/411.shtml @@ -2,5 +2,5 @@ -
The request method, with which the server has been requested requires a valid Content-Length header.
+

The request method, with which the server has been requested requires a valid Content-Length header.

\ No newline at end of file diff --git a/customization/errorpage/412.shtml b/customization/errorpage/412.shtml index ac3cf35..7d27c06 100644 --- a/customization/errorpage/412.shtml +++ b/customization/errorpage/412.shtml @@ -2,5 +2,5 @@ -
The precondition on the request for the URL failed positive evaluation.
+

The precondition on the request for the URL failed positive evaluation.

\ No newline at end of file diff --git a/customization/errorpage/413.shtml b/customization/errorpage/413.shtml index 4814ee4..66ffb98 100644 --- a/customization/errorpage/413.shtml +++ b/customization/errorpage/413.shtml @@ -2,5 +2,5 @@ -
The request method, with which the server has been requested does not allow the data transmitted, or the data volume exceeds the capacity limit.
+

The request method, with which the server has been requested does not allow the data transmitted, or the data volume exceeds the capacity limit.

\ No newline at end of file diff --git a/customization/errorpage/414.shtml b/customization/errorpage/414.shtml index f3ad112..40f0535 100644 --- a/customization/errorpage/414.shtml +++ b/customization/errorpage/414.shtml @@ -2,5 +2,5 @@ -
The length of the requested URL exceeds the capacity limit for this server. The request cannot be processed.
+

The length of the requested URL exceeds the capacity limit for this server. The request cannot be processed.

\ No newline at end of file diff --git a/customization/errorpage/415.shtml b/customization/errorpage/415.shtml index 939ff24..bd5c507 100644 --- a/customization/errorpage/415.shtml +++ b/customization/errorpage/415.shtml @@ -2,5 +2,5 @@ -
The server does not support the media type transmitted in the request.
+

The server does not support the media type transmitted in the request.

\ No newline at end of file diff --git a/customization/errorpage/429.shtml b/customization/errorpage/429.shtml index cc2b31f..c1f39fb 100644 --- a/customization/errorpage/429.shtml +++ b/customization/errorpage/429.shtml @@ -2,6 +2,6 @@ -
The server has detected an unusually high number of requests from your network address - and will not process further requests until the flooding has subsided.
+

The server has detected an unusually high number of requests coming from your network () + and will not process further requests until the flooding has subsided.

\ No newline at end of file diff --git a/customization/errorpage/500.shtml b/customization/errorpage/500.shtml index 6214974..be108ce 100644 --- a/customization/errorpage/500.shtml +++ b/customization/errorpage/500.shtml @@ -2,5 +2,5 @@ -
The server encountered an internal error and was unable to complete your request. Either the server is overloaded or there was an error in a CGI script.
+

The server encountered an internal error and was unable to complete your request. Either the server is overloaded or there was an error in a CGI script.

\ No newline at end of file diff --git a/customization/errorpage/501.shtml b/customization/errorpage/501.shtml index 3760c9f..e2987b1 100644 --- a/customization/errorpage/501.shtml +++ b/customization/errorpage/501.shtml @@ -2,5 +2,5 @@ -
The server does not support the action requested by the client.
+

The server does not support the action requested by the client.

\ No newline at end of file diff --git a/customization/errorpage/502.shtml b/customization/errorpage/502.shtml new file mode 100644 index 0000000..6629e18 --- /dev/null +++ b/customization/errorpage/502.shtml @@ -0,0 +1,7 @@ + + + + +

The server was acting as a gateway or proxy and received an invalid response from the upstream server (or + the upstream server is currently unavailable due to maintenance downtime or capacity problems).

+ \ No newline at end of file diff --git a/customization/errorpage/503.shtml b/customization/errorpage/503.shtml index 67e6861..4d3c807 100644 --- a/customization/errorpage/503.shtml +++ b/customization/errorpage/503.shtml @@ -2,5 +2,5 @@ -
The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.
+

The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.

\ No newline at end of file diff --git a/customization/errorpage/504.shtml b/customization/errorpage/504.shtml index 1764e5d..03cf20f 100644 --- a/customization/errorpage/504.shtml +++ b/customization/errorpage/504.shtml @@ -2,5 +2,5 @@ -
The gateway did not receive a timely response from the upstream server or application.
+

The gateway did not receive a timely response from the upstream server or application.

\ No newline at end of file diff --git a/customization/errorpage/header.shtml b/customization/errorpage/header.shtml index 0c0a526..ac22303 100644 --- a/customization/errorpage/header.shtml +++ b/customization/errorpage/header.shtml @@ -14,7 +14,7 @@ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ html{margin:0;padding:0;height:100%;box-sizing:border-box;font-size:1.25rem;font-family:'Share Tech Mono',sans-serif;color:#333;background:#EEE;} body{margin:0;padding:0;height:100%;box-sizing:border-box;font-size:1.00rem;line-height:1.20rem;display:flex;text-align:center;} - main{margin:auto;max-width:40rem;}div{font-size:0.8rem;color:#0060A0;}span{color:#C45C66;} + main{margin:auto;max-width:30rem;}p{margin:0;font-size:0.8rem;color:#0060A0;}code{color:#C45C66;font-weight:bold;} /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ /* Responsive -- cgit v1.2.3