From 43c9b35deb674509203c6991fbdab2fc6594df28 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Mon, 28 Aug 2017 08:17:32 +0200 Subject: There are now separate files for header and footer, which simplifies the creation of error messages, since you can now output HTML code directly instead of defining the message into a variable which escapes the containing HTML code. In addition, a new error page for "429 Too Many Requests" has been added and a little change in the stylesheet was made. --- conf-available/errorpage.conf | 2 ++ customization/errorpage/400.shtml | 5 +++-- customization/errorpage/401.shtml | 5 +++-- customization/errorpage/403.shtml | 5 +++-- customization/errorpage/404.shtml | 5 +++-- customization/errorpage/405.shtml | 5 +++-- customization/errorpage/408.shtml | 5 +++-- customization/errorpage/409.shtml | 5 +++-- customization/errorpage/410.shtml | 5 +++-- customization/errorpage/411.shtml | 5 +++-- customization/errorpage/412.shtml | 5 +++-- customization/errorpage/413.shtml | 5 +++-- customization/errorpage/414.shtml | 5 +++-- customization/errorpage/415.shtml | 5 +++-- customization/errorpage/429.shtml | 7 ++++++ customization/errorpage/500.shtml | 5 +++-- customization/errorpage/501.shtml | 5 +++-- customization/errorpage/503.shtml | 5 +++-- customization/errorpage/504.shtml | 5 +++-- customization/errorpage/footer.shtml | 3 +++ customization/errorpage/header.shtml | 37 ++++++++++++++++++++++++++++++++ customization/errorpage/main.shtml | 41 ------------------------------------ 22 files changed, 100 insertions(+), 75 deletions(-) create mode 100644 customization/errorpage/429.shtml create mode 100644 customization/errorpage/footer.shtml create mode 100644 customization/errorpage/header.shtml delete mode 100644 customization/errorpage/main.shtml diff --git a/conf-available/errorpage.conf b/conf-available/errorpage.conf index e52fb3f..26071e6 100644 --- a/conf-available/errorpage.conf +++ b/conf-available/errorpage.conf @@ -12,6 +12,7 @@ Alias /errorpage/413 /etc/apache2/customization/errorpage/413.shtml Alias /errorpage/414 /etc/apache2/customization/errorpage/414.shtml Alias /errorpage/415 /etc/apache2/customization/errorpage/415.shtml + 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/503 /etc/apache2/customization/errorpage/503.shtml @@ -30,6 +31,7 @@ ErrorDocument 413 /errorpage/413 ErrorDocument 414 /errorpage/414 ErrorDocument 415 /errorpage/415 + ErrorDocument 429 /errorpage/429 ErrorDocument 500 /errorpage/500 ErrorDocument 501 /errorpage/501 ErrorDocument 503 /errorpage/503 diff --git a/customization/errorpage/400.shtml b/customization/errorpage/400.shtml index 385c7a9..90e2e15 100644 --- a/customization/errorpage/400.shtml +++ b/customization/errorpage/400.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 80a197c..d6cfe68 100644 --- a/customization/errorpage/401.shtml +++ b/customization/errorpage/401.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 4aa3b64..fb59017 100644 --- a/customization/errorpage/403.shtml +++ b/customization/errorpage/403.shtml @@ -1,5 +1,6 @@ - - + +
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 1139aaa..714e4e0 100644 --- a/customization/errorpage/404.shtml +++ b/customization/errorpage/404.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 0dbcc7b..2e699cc 100644 --- a/customization/errorpage/405.shtml +++ b/customization/errorpage/405.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 c6ab88a..09ed971 100644 --- a/customization/errorpage/408.shtml +++ b/customization/errorpage/408.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 dccd853..c59360c 100644 --- a/customization/errorpage/409.shtml +++ b/customization/errorpage/409.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 1e2b65f..ac56756 100644 --- a/customization/errorpage/410.shtml +++ b/customization/errorpage/410.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 0b7ac1e..253c59e 100644 --- a/customization/errorpage/411.shtml +++ b/customization/errorpage/411.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 1d9f9da..ac3cf35 100644 --- a/customization/errorpage/412.shtml +++ b/customization/errorpage/412.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 f772be8..4814ee4 100644 --- a/customization/errorpage/413.shtml +++ b/customization/errorpage/413.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 bad1228..f3ad112 100644 --- a/customization/errorpage/414.shtml +++ b/customization/errorpage/414.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 dc49b75..939ff24 100644 --- a/customization/errorpage/415.shtml +++ b/customization/errorpage/415.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 new file mode 100644 index 0000000..cc2b31f --- /dev/null +++ b/customization/errorpage/429.shtml @@ -0,0 +1,7 @@ + + + + +
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.
+ \ No newline at end of file diff --git a/customization/errorpage/500.shtml b/customization/errorpage/500.shtml index d08dfbc..6214974 100644 --- a/customization/errorpage/500.shtml +++ b/customization/errorpage/500.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 cca0cbb..3760c9f 100644 --- a/customization/errorpage/501.shtml +++ b/customization/errorpage/501.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
The server does not support the action requested by the client.
+ \ No newline at end of file diff --git a/customization/errorpage/503.shtml b/customization/errorpage/503.shtml index 5c28812..67e6861 100644 --- a/customization/errorpage/503.shtml +++ b/customization/errorpage/503.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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 8dcc94d..1764e5d 100644 --- a/customization/errorpage/504.shtml +++ b/customization/errorpage/504.shtml @@ -1,5 +1,6 @@ - - \ No newline at end of file + +
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/footer.shtml b/customization/errorpage/footer.shtml new file mode 100644 index 0000000..8959bbd --- /dev/null +++ b/customization/errorpage/footer.shtml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/customization/errorpage/header.shtml b/customization/errorpage/header.shtml new file mode 100644 index 0000000..0c0a526 --- /dev/null +++ b/customization/errorpage/header.shtml @@ -0,0 +1,37 @@ + + + + + + + <!--#echo var="ERRORPAGE_CODE" --> <!--#echo var="ERRORPAGE_TEXT" --> + + +
+

diff --git a/customization/errorpage/main.shtml b/customization/errorpage/main.shtml deleted file mode 100644 index 1c34a77..0000000 --- a/customization/errorpage/main.shtml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - <!--#echo var="ERRORPAGE_CODE" --> <!--#echo var="ERRORPAGE_TEXT" --> - - -
-

-
-
- - \ No newline at end of file -- cgit v1.2.3