From 28c1bd9270c4b156abb4efa55891e71475e9328e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20B=C3=B6ttcher?= Date: Thu, 6 Apr 2017 11:51:37 +0200 Subject: [PATCH] ODT - reorder --- .../cms-odt-daimler-com.pixelpark.net.yaml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml index 4bb47712..b2b5e104 100644 --- a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml +++ b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml @@ -47,12 +47,6 @@ infra::profile::apache::pp_vhosts: - login: rewrite_rule: - '^(/)?$ https://%%{ich-trickse}{SERVER_NAME}/system/login [L,R=301]' - - proxy_non_https: - rewrite_cond: - - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]' - - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)' - rewrite_rule: - - '^(.*)$ http://localhost:8080/opencms$1 [P,L]' - 404handler_non_https: comment: 'missing export to opencms' rewrite_cond: @@ -61,13 +55,7 @@ infra::profile::apache::pp_vhosts: - '%%{ich-trickse}{DOCUMENT_ROOT}%%{ich-trickse}{REQUEST_FILENAME} !-f' rewrite_rule: - '^(.*)$ http://localhost:8080/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]' - - proxy_https: - rewrite_cond: - - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]' - - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)' - rewrite_rule: - - '^(.*)$ http://localhost:8081/opencms$1 [P,L]' - - 404handler_non_https: + - 404handler_https: comment: 'missing export to opencms' rewrite_cond: - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]' @@ -75,6 +63,18 @@ infra::profile::apache::pp_vhosts: - '%%{ich-trickse}{DOCUMENT_ROOT}%%{ich-trickse}{REQUEST_FILENAME} !-f' rewrite_rule: - '^(.*)$ http://localhost:8081/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]' + - proxy_non_https: + rewrite_cond: + - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]' + - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)' + rewrite_rule: + - '^(.*)$ http://localhost:8080/opencms$1 [P,L]' + - proxy_https: + rewrite_cond: + - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]' + - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)' + rewrite_rule: + - '^(.*)$ http://localhost:8081/opencms$1 [P,L]' proxy_preserve_host: true directories: - access-control-fonts: -- 2.39.5