ODT - fix int rewrites

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 b5e1d51460ec4cddb96be40b3d2a356f731deb43..bcf73746d790cea6b0f9a02874d4c51c577e3a1f 100644 (file)
--- a/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
@@ -38,7 +38,10 @@ infra::profile::apache::pp_vhosts:
       - https:
         comment: 'all to https'
         rewrite_rule:
-          - '^(.*)$ https://int-cms-odt-daimler-com.pixelpark.net$1 [L,R=301]'
+          - '^/system/(.*)$ https://int-cms-odt-daimler-com.pixelpark.net/system/$1 [L,R=301]'
+      - login:
+        rewrite_rule:
+          - '^(/)?$  https://int-cms-odt-daimler-com.pixelpark.net/system/login [L,R=301]'
       - proxy_non_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
@@ -82,10 +85,11 @@ infra::profile::apache::pp_vhosts:
         rewrite_rule:
                 - '^/opencms/(.*)$ /$1 [R,L]'
     rewrites_non_ssl:
-      - https:
-        comment: 'all to https'
+      - https_forms:
+        rewrite_cond:
+          - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]'
         rewrite_rule:
-          - '^(.*)$ https://int-cms-odt-daimler-com.pixelpark.net$1 [L,R=301]'
+          - '^(.*)$ https://int-newsletter-mercedes-benz-de.pixelpark.net$1 [R=301,L,QSA,NE]'
       - proxy_non_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
@@ -129,10 +133,11 @@ infra::profile::apache::pp_vhosts:
         rewrite_rule:
                 - '^/opencms/(.*)$ /$1 [R,L]'
     rewrites_non_ssl:
-      - https:
-        comment: 'all to https'
+      - https_forms:
+        rewrite_cond:
+          - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]'
         rewrite_rule:
-          - '^(.*)$ https://int-cms-odt-daimler-com.pixelpark.net$1 [L,R=301]'
+          - '^(.*)$ https://int-newsletter-smart-de.pixelpark.net$1 [R=301,L,QSA,NE]'
       - proxy_non_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
@@ -176,10 +181,11 @@ infra::profile::apache::pp_vhosts:
         rewrite_rule:
                 - '^/opencms/(.*)$ /$1 [R,L]'
     rewrites_non_ssl:
-      - https:
-        comment: 'all to https'
+      - https_forms:
+        rewrite_cond:
+          - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]'
         rewrite_rule:
-          - '^(.*)$ https://int-cms-odt-daimler-com.pixelpark.net$1 [L,R=301]'
+          - '^(.*)$ https://int-newsletter-truckworks-de.pixelpark.net$1 [R=301,L,QSA,NE]'
       - proxy_non_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
@@ -211,7 +217,7 @@ infra::profile::apache::pp_vhosts:
     docroot: /var/www/html
     ssl: true
     cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'    
+    cert_customer: 'pixelpark'
     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'