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 42d916f2b838584b50a4d0903c3f65b246ebcc59..c91929cf44b040ac5054a00dd338f7754096530a 100644 (file)
--- a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
@@ -120,7 +120,46 @@ site::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{DOCUMENT_ROOT}%%{ich-trickse}{REQUEST_FILENAME} !-f'
         rewrite_rule:
           - '^(.*)$ http://localhost:8083/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]'
+      - 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:
+        proxy_pass:
+          - '^/content/(r\.html|g\.html|form\.do) http://93.188.107.198:8081/$1 [P,L,QSA,NE]'
+      - proxy_forms_nonssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^/r/ http://localhost:8082/opencms/forms_retail/ [P,L]'
+          - '^/anmeldung/ http://localhost:8082/opencms/forms_wholesale/anmeldung/ [P,L]'
+          - '^/w/ http://localhost:8082/opencms/forms_wholesale/ [P,L]'
+          - '^/w/abmeldung_promo/ http://localhost:8082/opencms/forms_wholesale/abmeldung_promo/ [P,L]'
+          - '^/anmeldung-transporter/ http://localhost:8082/opencms/forms_trapo_wholesale/anmeldung/ [P,L]'
+      - proxy_forms_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/r/ http://localhost:8083/opencms/forms_retail/ [P,L]'
+          - '^/anmeldung/ http://localhost:8083/opencms/forms_wholesale/anmeldung/ [P,L]'
+          - '^/w/ http://localhost:8083/opencms/forms_wholesale/ [P,L]'
+          - '^/w/abmeldung_promo/ http://localhost:8083/opencms/forms_wholesale/abmeldung_promo/ [P,L]'
+          - '^/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_preserve_host: true
+    directories:
+      - access-control-fonts:
+        provider: filesmatch
+        path: '\.(ttf|ttc|otf|eot|woff|svg)$'
+        headers:
+          - 'set Access-Control-Allow-Origin "*"'
   smart:
     docroot: '/var/lib/tomcat/catalina/odt-cms/webapps/ROOT'
     docroot_owner: tomcat
@@ -133,7 +172,7 @@ site::profile::apache::pp_vhosts:
       - opencms_to_slash:
         comment: '/opencms to /'
         rewrite_rule:
-                - '^/opencms/(.*)$ /$1 [R,L]'
+          - '^/opencms/(.*)$ /$1 [R,L]'
     rewrites_non_ssl:
       - proxy_non_https:
         rewrite_cond:
@@ -165,6 +204,12 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(.*)$ http://localhost:8085/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]'
     proxy_preserve_host: true
+    directories:
+      - access-control-fonts:
+        provider: filesmatch
+        path: '\.(ttf|ttc|otf|eot|woff|svg)$'
+        headers:
+          - 'set Access-Control-Allow-Origin "*"'
   tw:
     docroot: '/var/lib/tomcat/catalina/odt-cms/webapps/ROOT'
     docroot_owner: tomcat
@@ -209,6 +254,12 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^(.*)$ http://localhost:8087/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]'
     proxy_preserve_host: true
+    directories:
+      - access-control-fonts:
+        provider: filesmatch
+        path: '\.(ttf|ttc|otf|eot|woff|svg)$'
+        headers:
+          - 'set Access-Control-Allow-Origin "*"'
   kampagnen:
     servername: kampagnen.mercedes-benz.de
     serveraliases: