From 3b78e65b2b0bfde09b05d1aa25750d81d46ca252 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Mon, 6 Mar 2017 13:46:46 -0500 Subject: [PATCH 01/12] Added better default nginx error pages --- .../nginx-vhosts/templates/nginx.conf.sigil | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 6638afe37..903f4f58d 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -34,6 +34,20 @@ server { proxy_set_header X-Request-Start $msec; } include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; + + error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; + location /400-error.html { + return 400 '

THERE HAS BEEN AN ERROR.

'; + + error_page 404 /404-error.html; + location /404-error.html { + return 404 '

404. Page Not Found.

'; + } + + error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; + location /500-error.html { + return 500 '

THERE HAS BEEN AN ERROR.

'; + } {{ end }} } {{ else if eq $scheme "https"}} @@ -72,6 +86,22 @@ server { proxy_set_header X-Request-Start $msec; } include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; + + + error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; + location /400-error.html { + return 400 '

THERE HAS BEEN AN ERROR.

'; + + error_page 404 /404-error.html; + location /404-error.html { + return 404 '

404. Page Not Found.

'; + } + + error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; + location /500-error.html { + return 500 '

THERE HAS BEEN AN ERROR.

'; + } + } {{ end }}{{ end }} From fa286caca2f75416c4cf3f33babde3f0c1d29387 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Tue, 7 Mar 2017 09:14:24 -0500 Subject: [PATCH 02/12] Switched to templated error pages --- plugins/nginx-vhosts/install | 7 ++++++ plugins/nginx-vhosts/templates/400-error.html | 9 ++++++++ plugins/nginx-vhosts/templates/404-error.html | 9 ++++++++ plugins/nginx-vhosts/templates/500-error.html | 9 ++++++++ .../nginx-vhosts/templates/nginx.conf.sigil | 22 ++++++++++++------- 5 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 plugins/nginx-vhosts/templates/400-error.html create mode 100644 plugins/nginx-vhosts/templates/404-error.html create mode 100644 plugins/nginx-vhosts/templates/500-error.html diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index 8b4d53217..0254b02f4 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -52,6 +52,13 @@ chgrp -R adm /var/log/nginx gpasswd -M "" dokku [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/create 0640 www-data dokku/create 0640 www-data adm/g' /etc/logrotate.d/nginx +# Create nginx error templates +sudo mkdir -p /etc/nginx/dokku-errors +sudo cp ./templates/400-error.html /etc/nginx/dokku-errors/400-error.html +sudo cp ./templates/404-error.html /etc/nginx/dokku-errors/404-error.html +sudo cp ./templates/500-error.html /etc/nginx/dokku-errors/500-error.html + + # patch broken nginx 1.8.0 logrotate [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/invoke-rc.d/service/g' /etc/logrotate.d/nginx diff --git a/plugins/nginx-vhosts/templates/400-error.html b/plugins/nginx-vhosts/templates/400-error.html new file mode 100644 index 000000000..223aa802b --- /dev/null +++ b/plugins/nginx-vhosts/templates/400-error.html @@ -0,0 +1,9 @@ + + +
+
+

THERE HAS BEEN AN ERROR.

+
+
+ +'; diff --git a/plugins/nginx-vhosts/templates/404-error.html b/plugins/nginx-vhosts/templates/404-error.html new file mode 100644 index 000000000..474df07fd --- /dev/null +++ b/plugins/nginx-vhosts/templates/404-error.html @@ -0,0 +1,9 @@ + + +
+
+

404. NOT FOUND.

+
+
+ +'; diff --git a/plugins/nginx-vhosts/templates/500-error.html b/plugins/nginx-vhosts/templates/500-error.html new file mode 100644 index 000000000..223aa802b --- /dev/null +++ b/plugins/nginx-vhosts/templates/500-error.html @@ -0,0 +1,9 @@ + + +
+
+

THERE HAS BEEN AN ERROR.

+
+
+ +'; diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 903f4f58d..57e737370 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -37,16 +37,20 @@ server { error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; location /400-error.html { - return 400 '

THERE HAS BEEN AN ERROR.

'; + root /etc/nginx/dokku-errors; + internal; + } error_page 404 /404-error.html; location /404-error.html { - return 404 '

404. Page Not Found.

'; + root /etc/nginx/dokku-errors; + internal; } error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; location /500-error.html { - return 500 '

THERE HAS BEEN AN ERROR.

'; + root /etc/nginx/dokku-errors; + internal; } {{ end }} } @@ -87,21 +91,23 @@ server { } include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; - error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; location /400-error.html { - return 400 '

THERE HAS BEEN AN ERROR.

'; + root /etc/nginx/dokku-errors; + internal; + } error_page 404 /404-error.html; location /404-error.html { - return 404 '

404. Page Not Found.

'; + root /etc/nginx/dokku-errors; + internal; } error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; location /500-error.html { - return 500 '

THERE HAS BEEN AN ERROR.

'; + root /etc/nginx/dokku-errors; + internal; } - } {{ end }}{{ end }} From 3f4b1e69c78359384a0ad84e67627f5a8f2b18f9 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Tue, 7 Mar 2017 14:28:38 -0500 Subject: [PATCH 03/12] Requested improvements - Moved the template files - Replaced . with $PWD - Made more descriptive errors in the templates --- plugins/nginx-vhosts/install | 8 ++++---- plugins/nginx-vhosts/templates/400-error.html | 2 +- plugins/nginx-vhosts/templates/404-error.html | 2 +- plugins/nginx-vhosts/templates/500-error.html | 2 +- plugins/nginx-vhosts/templates/nginx.conf.sigil | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index 0254b02f4..d71b7803a 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -53,10 +53,10 @@ gpasswd -M "" dokku [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/create 0640 www-data dokku/create 0640 www-data adm/g' /etc/logrotate.d/nginx # Create nginx error templates -sudo mkdir -p /etc/nginx/dokku-errors -sudo cp ./templates/400-error.html /etc/nginx/dokku-errors/400-error.html -sudo cp ./templates/404-error.html /etc/nginx/dokku-errors/404-error.html -sudo cp ./templates/500-error.html /etc/nginx/dokku-errors/500-error.html +sudo mkdir -p $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors +sudo cp $PWD/templates/400-error.html $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors/400-error.html +sudo cp $PWD/templates/404-error.html $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors/404-error.html +sudo cp $PWD/templates/500-error.html $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors/500-error.html # patch broken nginx 1.8.0 logrotate diff --git a/plugins/nginx-vhosts/templates/400-error.html b/plugins/nginx-vhosts/templates/400-error.html index 223aa802b..f3353b09f 100644 --- a/plugins/nginx-vhosts/templates/400-error.html +++ b/plugins/nginx-vhosts/templates/400-error.html @@ -2,7 +2,7 @@
-

THERE HAS BEEN AN ERROR.

+

THERE HAS BEEN A 400 ERROR.

diff --git a/plugins/nginx-vhosts/templates/404-error.html b/plugins/nginx-vhosts/templates/404-error.html index 474df07fd..65b300366 100644 --- a/plugins/nginx-vhosts/templates/404-error.html +++ b/plugins/nginx-vhosts/templates/404-error.html @@ -2,7 +2,7 @@
-

404. NOT FOUND.

+

THERE HAS BEEN A 404 ERROR.

diff --git a/plugins/nginx-vhosts/templates/500-error.html b/plugins/nginx-vhosts/templates/500-error.html index 223aa802b..daf96605b 100644 --- a/plugins/nginx-vhosts/templates/500-error.html +++ b/plugins/nginx-vhosts/templates/500-error.html @@ -2,7 +2,7 @@
-

THERE HAS BEEN AN ERROR.

+

THERE HAS BEEN A 500 ERROR.

diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 57e737370..37451d304 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -37,19 +37,19 @@ server { error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; location /400-error.html { - root /etc/nginx/dokku-errors; + root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; internal; } error_page 404 /404-error.html; location /404-error.html { - root /etc/nginx/dokku-errors; + root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; internal; } error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; location /500-error.html { - root /etc/nginx/dokku-errors; + root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; internal; } {{ end }} @@ -93,19 +93,19 @@ server { error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; location /400-error.html { - root /etc/nginx/dokku-errors; + root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; internal; } error_page 404 /404-error.html; location /404-error.html { - root /etc/nginx/dokku-errors; + root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; internal; } error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; location /500-error.html { - root /etc/nginx/dokku-errors; + root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; internal; } } From e5f3dcaaef4224c87ae8ab04d3a738950bb05eb0 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Tue, 7 Mar 2017 14:38:19 -0500 Subject: [PATCH 04/12] Quoted Variable usage --- plugins/nginx-vhosts/install | 8 ++++---- plugins/nginx-vhosts/templates/nginx.conf.sigil | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index d71b7803a..846f78329 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -53,10 +53,10 @@ gpasswd -M "" dokku [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/create 0640 www-data dokku/create 0640 www-data adm/g' /etc/logrotate.d/nginx # Create nginx error templates -sudo mkdir -p $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors -sudo cp $PWD/templates/400-error.html $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors/400-error.html -sudo cp $PWD/templates/404-error.html $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors/404-error.html -sudo cp $PWD/templates/500-error.html $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors/500-error.html +sudo mkdir -p ${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors +sudo cp ${PWD}/templates/400-error.html ${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/400-error.html +sudo cp ${PWD}/templates/404-error.html ${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/404-error.html +sudo cp ${PWD}/templates/500-error.html ${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/500-error.html # patch broken nginx 1.8.0 logrotate diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 37451d304..34e53c265 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -37,19 +37,19 @@ server { error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; location /400-error.html { - root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; internal; } error_page 404 /404-error.html; location /404-error.html { - root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; internal; } error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; location /500-error.html { - root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; internal; } {{ end }} @@ -93,19 +93,19 @@ server { error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html; location /400-error.html { - root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; internal; } error_page 404 /404-error.html; location /404-error.html { - root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; internal; } error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html; location /500-error.html { - root $DOKKU_LIB_ROOT/data/nginx-vhosts/dokku-errors; + root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; internal; } } From 22f670d999576455da80d93ef13711e2a9192466 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Tue, 7 Mar 2017 14:50:14 -0500 Subject: [PATCH 05/12] Fixed variable syntax in install script --- plugins/nginx-vhosts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index 846f78329..9d4ce1679 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -53,10 +53,10 @@ gpasswd -M "" dokku [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/create 0640 www-data dokku/create 0640 www-data adm/g' /etc/logrotate.d/nginx # Create nginx error templates -sudo mkdir -p ${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors -sudo cp ${PWD}/templates/400-error.html ${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/400-error.html -sudo cp ${PWD}/templates/404-error.html ${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/404-error.html -sudo cp ${PWD}/templates/500-error.html ${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/500-error.html +sudo mkdir -p "${DOKKU_LIB_ROOT}"/data/nginx-vhosts/dokku-errors +sudo cp "${PWD}"/templates/400-error.html "${DOKKU_LIB_ROOT}"/data/nginx-vhosts/dokku-errors/400-error.html +sudo cp "${PWD}"/templates/404-error.html "${DOKKU_LIB_ROOT}"/data/nginx-vhosts/dokku-errors/404-error.html +sudo cp "${PWD}"/templates/500-error.html "${DOKKU_LIB_ROOT}"/data/nginx-vhosts/dokku-errors/500-error.html # patch broken nginx 1.8.0 logrotate From 4c354bdcd69d7840bcbf2ee247df797e89a34e11 Mon Sep 17 00:00:00 2001 From: Chiedo Date: Tue, 7 Mar 2017 15:53:16 -0500 Subject: [PATCH 06/12] lol --- plugins/nginx-vhosts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index 9d4ce1679..9b4931723 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -53,10 +53,10 @@ gpasswd -M "" dokku [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/create 0640 www-data dokku/create 0640 www-data adm/g' /etc/logrotate.d/nginx # Create nginx error templates -sudo mkdir -p "${DOKKU_LIB_ROOT}"/data/nginx-vhosts/dokku-errors -sudo cp "${PWD}"/templates/400-error.html "${DOKKU_LIB_ROOT}"/data/nginx-vhosts/dokku-errors/400-error.html -sudo cp "${PWD}"/templates/404-error.html "${DOKKU_LIB_ROOT}"/data/nginx-vhosts/dokku-errors/404-error.html -sudo cp "${PWD}"/templates/500-error.html "${DOKKU_LIB_ROOT}"/data/nginx-vhosts/dokku-errors/500-error.html +mkdir -p "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors" +cp "${PWD}/templates/400-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/400-error.html" +cp "${PWD}/templates/404-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/404-error.html" +cp "${PWD}/templates/500-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/500-error.html" # patch broken nginx 1.8.0 logrotate From 58c2ad8e4bb0be27f2b6a80964267f2eb69671ac Mon Sep 17 00:00:00 2001 From: Chiedo Date: Tue, 7 Mar 2017 16:10:46 -0500 Subject: [PATCH 07/12] Attempt to fix plugin path --- plugins/nginx-vhosts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index 9b4931723..d8af5387b 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -54,9 +54,9 @@ gpasswd -M "" dokku # Create nginx error templates mkdir -p "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors" -cp "${PWD}/templates/400-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/400-error.html" -cp "${PWD}/templates/404-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/404-error.html" -cp "${PWD}/templates/500-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/500-error.html" +cp "${PLUGIN_CORE_AVAILABLE_PATH}/nginx-vhosts/templates/400-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/400-error.html" +cp "${PLUGIN_CORE_AVAILABLE_PATH}/nginx-vhosts/templates/404-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/404-error.html" +cp "${PLUGIN_CORE_AVAILABLE_PATH}/nginx-vhosts/templates/500-error.html" "${DOKKU_LIB_ROOT}/data/nginx-vhosts/dokku-errors/500-error.html" # patch broken nginx 1.8.0 logrotate From 12b44c865b382f475af14207a2679446f9df080a Mon Sep 17 00:00:00 2001 From: Chiedo Date: Wed, 8 Mar 2017 07:49:21 -0500 Subject: [PATCH 08/12] Exposed function to nginx template --- plugins/nginx-vhosts/functions | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions index 4778d266d..b41a69921 100755 --- a/plugins/nginx-vhosts/functions +++ b/plugins/nginx-vhosts/functions @@ -289,6 +289,7 @@ nginx_build_config() { local SIGIL_PARAMS=(-f $NGINX_TEMPLATE APP="$APP" DOKKU_ROOT="$DOKKU_ROOT" NOSSL_SERVER_NAME="$NOSSL_SERVER_NAME" DOKKU_APP_LISTENERS="$DOKKU_APP_LISTENERS" + DOKKU_LIB_ROOT="$DOKKU_LIB_ROOT" PASSED_LISTEN_IP_PORT="$PASSED_LISTEN_IP_PORT" SPDY_SUPPORTED="$SPDY_SUPPORTED" HTTP2_SUPPORTED="$HTTP2_SUPPORTED" From 04dda5e3475c186f3d2aa27d7d14d19c7a6e75b2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Apr 2017 15:40:26 -0600 Subject: [PATCH 09/12] Update 500-error.html Base it more closely on the rails application error page --- plugins/nginx-vhosts/templates/500-error.html | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/plugins/nginx-vhosts/templates/500-error.html b/plugins/nginx-vhosts/templates/500-error.html index daf96605b..e58fa77bc 100644 --- a/plugins/nginx-vhosts/templates/500-error.html +++ b/plugins/nginx-vhosts/templates/500-error.html @@ -1,9 +1,33 @@ + - -
-
-

THERE HAS BEEN A 500 ERROR.

-
-
- -'; + + We're sorry, but something went wrong (500) + + + + + +
+

We're sorry, but something went wrong.

+

If you are the application owner check the logs for more information.

+
+ + From 41947024423173c79fe14c40298883915aac2115 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Apr 2017 15:42:06 -0600 Subject: [PATCH 10/12] Update 404-error.html Base it more closely on the rails application error page --- plugins/nginx-vhosts/templates/404-error.html | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/plugins/nginx-vhosts/templates/404-error.html b/plugins/nginx-vhosts/templates/404-error.html index 65b300366..b2e65ccda 100644 --- a/plugins/nginx-vhosts/templates/404-error.html +++ b/plugins/nginx-vhosts/templates/404-error.html @@ -1,9 +1,33 @@ + - -
-
-

THERE HAS BEEN A 404 ERROR.

-
-
- -'; + + The page you were looking for doesn't exist (404) + + + + + +
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+

If you are the application owner check the logs for more information.

+
+ + From c05ceb0affb56f85d9ba56ef7339028d2b403e58 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Apr 2017 15:42:25 -0600 Subject: [PATCH 11/12] Update 500-error.html --- plugins/nginx-vhosts/templates/500-error.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/nginx-vhosts/templates/500-error.html b/plugins/nginx-vhosts/templates/500-error.html index e58fa77bc..617925fdc 100644 --- a/plugins/nginx-vhosts/templates/500-error.html +++ b/plugins/nginx-vhosts/templates/500-error.html @@ -11,7 +11,6 @@ font-family: arial, sans-serif; margin: 0; } - div { position:absolute; top: 50%; @@ -19,7 +18,7 @@ transform: translateX(-50%) translateY(-50%); } p { - color: #666; + color: #eee; } From a7b929a80ed7254a781c33ffe61c4992c9be3af2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 22 Apr 2017 15:44:24 -0600 Subject: [PATCH 12/12] Update 400-error.html Base it more closely on the rails application error page --- plugins/nginx-vhosts/templates/400-error.html | 39 +++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/plugins/nginx-vhosts/templates/400-error.html b/plugins/nginx-vhosts/templates/400-error.html index f3353b09f..2f4c79b9c 100644 --- a/plugins/nginx-vhosts/templates/400-error.html +++ b/plugins/nginx-vhosts/templates/400-error.html @@ -1,9 +1,32 @@ + - -
-
-

THERE HAS BEEN A 400 ERROR.

-
-
- -'; + + The page you were looking for cannot be served (4xx) + + + + + +
+

The page you were looking for cannot be served.

+

If you are the application owner check the logs for more information.

+
+ +