From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Wed, 5 Apr 2017 13:55:05 +0000 (+0200)
Subject: ODT - umzug
X-Git-Tag: v0.1.0~3303^2~1
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6b85ac54bc65d0dcbdd95f706d5140fadac33021;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 109c78d4..df5ec0e2 100644
--- a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
@@ -93,7 +93,13 @@ site::profile::apache::pp_vhosts:
       - opencms_to_slash:
         comment: '/opencms to /'
         rewrite_rule:
-                - '^/opencms/(.*)$ /$1 [R,L]'
+          - '^/opencms/(.*)$ /$1 [R,L]'
+      - https_forms:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+          - '%%{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]'
       - 404handler_non_https:
         comment: 'missing export to opencms'
         rewrite_cond:
@@ -117,7 +123,7 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(/)?$ http://www.mercedes-benz.de [R=301,L]'
       - proxy_openemm:
-        proxy_pass:
+        rewrite_rule:
           - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.198:8081/$1 [P,L,QSA,NE]'
       - proxy_forms_r_nonssl:
         rewrite_cond:
@@ -169,12 +175,6 @@ site::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
         rewrite_rule:
           - '^/anmeldung-transporter/ http://localhost:8083/opencms/forms_trapo_wholesale/anmeldung/ [P,L]'
-      - https_forms:
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-          - '%%{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]'