From a8a9bc93abc607454cdc8427a62d2ea4ca21aa85 Mon Sep 17 00:00:00 2001 From: chrisjdixon Date: Mon, 18 Jul 2022 17:29:19 +1000 Subject: [PATCH] moved "include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf" after default error pages --- plugins/nginx-vhosts/templates/nginx.conf.sigil | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/nginx-vhosts/templates/nginx.conf.sigil b/plugins/nginx-vhosts/templates/nginx.conf.sigil index 803878c6f..8673ac0a7 100644 --- a/plugins/nginx-vhosts/templates/nginx.conf.sigil +++ b/plugins/nginx-vhosts/templates/nginx.conf.sigil @@ -44,7 +44,6 @@ server { } {{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }} - 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 { @@ -64,6 +63,7 @@ server { internal; } {{ end }} + include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; } {{ else if eq $scheme "https"}} server { @@ -110,7 +110,6 @@ server { } {{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }} - 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 { @@ -135,6 +134,7 @@ server { root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors; internal; } + include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; } {{ else if eq $scheme "grpc"}} {{ if eq $.GRPC_SUPPORTED "true"}}{{ if eq $.HTTP2_SUPPORTED "true"}}