From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Tue, 11 Jul 2017 08:28:33 +0000 (+0200)
Subject: ODT - fix fullfiew - syntax fix
X-Git-Tag: v0.1.0~2675^2~7
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=dc7733451b5a27f540789ebe5a0d4516875e96af;p=pixelpark%2Fhiera.git

ODT - fix fullfiew - syntax fix
---

diff --git a/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
index f469b52d..14fdd021 100644
--- a/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
@@ -82,7 +82,7 @@ infra::profile::apache::pp_vhosts:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    rewrites:
+    rewrites_non_ssl:
       - opencms_to_slash:
         comment: '/opencms to /'
         rewrite_rule:
@@ -96,7 +96,6 @@ infra::profile::apache::pp_vhosts:
       - proxy_openemm:
         rewrite_rule:
           - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.233:8080/$1 [P,L,QSA,NE]'
-    rewrites_non_ssl:
       - https_forms:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]'
@@ -115,6 +114,19 @@ infra::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(.*)$ http://localhost:8082/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]'
     rewrites_ssl:
+      - opencms_to_slash:
+        comment: '/opencms to /'
+        rewrite_rule:
+          - '^/opencms/(.*)$ /$1 [R,L]'
+      - jsession_id:
+        rewrite_rule:
+          - '^(.*);jsessionid=[A-Za-z0-9]+(.*)$ $1$2 [L,R=301]'
+      - rewrite_slash:
+        rewrite_rule:
+          - '^(/)?$ http://www.mercedes-benz.de [R=301,L]'
+      - proxy_openemm:
+        rewrite_rule:
+          - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.233:8080/$1 [P,L,QSA,NE]'
       - proxy_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
@@ -139,7 +151,7 @@ infra::profile::apache::pp_vhosts:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    rewrites:
+    rewrites_non_ssl:
       - opencms_to_slash:
         comment: '/opencms to /'
         rewrite_rule:
@@ -153,7 +165,6 @@ infra::profile::apache::pp_vhosts:
       - proxy_openemm:
         rewrite_rule:
           - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.233:8080/$1 [P,L,QSA,NE]'
-    rewrites_non_ssl:
       - https_forms:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]'
@@ -172,6 +183,19 @@ infra::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(.*)$ http://localhost:8084/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]'
     rewrites_ssl:
+      - opencms_to_slash:
+        comment: '/opencms to /'
+        rewrite_rule:
+          - '^/opencms/(.*)$ /$1 [R,L]'
+      - jsession_id:
+        rewrite_rule:
+          - '^(.*);jsessionid=[A-Za-z0-9]+(.*)$ $1$2 [L,R=301]'
+      - rewrite_slash:
+        rewrite_rule:
+          - '^(/)?$ http://www.smart.de [R=301,L]'
+      - proxy_openemm:
+        rewrite_rule:
+          - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.233:8080/$1 [P,L,QSA,NE]'
       - proxy_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
@@ -196,7 +220,7 @@ infra::profile::apache::pp_vhosts:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    rewrites:
+    rewrites_non_ssl:
       - opencms_to_slash:
         comment: '/opencms to /'
         rewrite_rule:
@@ -210,7 +234,6 @@ infra::profile::apache::pp_vhosts:
       - proxy_openemm:
         rewrite_rule:
           - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.233:8080/$1 [P,L,QSA,NE]'
-    rewrites_non_ssl:
       - https_forms:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]'
@@ -229,6 +252,19 @@ infra::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(.*)$ http://localhost:8086/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]'
     rewrites_ssl:
+      - opencms_to_slash:
+        comment: '/opencms to /'
+        rewrite_rule:
+          - '^/opencms/(.*)$ /$1 [R,L]'
+      - jsession_id:
+        rewrite_rule:
+          - '^(.*);jsessionid=[A-Za-z0-9]+(.*)$ $1$2 [L,R=301]'
+      - rewrite_slash:
+        rewrite_rule:
+          - '^(/)?$ http://www.truckworks.de [R=301,L]'
+      - proxy_openemm:
+        rewrite_rule:
+          - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.233:8080/$1 [P,L,QSA,NE]'
       - proxy_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'