From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Wed, 5 Apr 2017 13:44:13 +0000 (+0200)
Subject: ODT - umzug
X-Git-Tag: v0.1.0~3303^2~2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=64082a9a197824a57e6abb830dd10c61570b5846;p=pixelpark%2Fhiera.git

ODT - umzug
---

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 81562cbe..109c78d4 100644
--- a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
@@ -94,12 +94,6 @@ site::profile::apache::pp_vhosts:
         comment: '/opencms to /'
         rewrite_rule:
                 - '^/opencms/(.*)$ /$1 [R,L]'
-      - 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:8082/opencms$1 [P,L]'
       - 404handler_non_https:
         comment: 'missing export to opencms'
         rewrite_cond:
@@ -108,12 +102,6 @@ site::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{DOCUMENT_ROOT}%%{ich-trickse}{REQUEST_FILENAME} !-f'
         rewrite_rule:
           - '^(.*)$ http://localhost:8082/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:8083/opencms$1 [P,L]'
       - 404handle_https:
         comment: 'missing export to opencms'
         rewrite_cond:
@@ -127,7 +115,7 @@ site::profile::apache::pp_vhosts:
           - '^(.*);jsessionid=[A-Za-z0-9]+(.*)$ $1$2 [L,R=301]'
       - rewrite_slash:
         rewrite_rule:
-          - '^(/)$ http://www.mercedes-benz.de [R=301,L]'
+          - '^(/)?$ http://www.mercedes-benz.de [R=301,L]'
       - proxy_openemm:
         proxy_pass:
           - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.198:8081/$1 [P,L,QSA,NE]'
@@ -187,6 +175,18 @@ site::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{REQUEST_URI} ^/(r|w|anmeldung|forms_retail|forms_wholesale)(/)? [NC]'
         rewrite_rule:
           - '^(.*)$ https://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L,QSA,NE]'
+      - 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:8082/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:8083/opencms$1 [P,L]'
     proxy_preserve_host: true
     directories:
       - access-control-fonts: