]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
projects / pixelpark / hiera.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d6a7bf0)
ODT - smart & truckworks
authorOliver Böttcher <oliver.boettcher@pixelpark.com>
Wed, 5 Apr 2017 14:53:51 +0000 (16:53 +0200)
committerOliver Böttcher <oliver.boettcher@pixelpark.com>
Wed, 5 Apr 2017 14:53:51 +0000 (16:53 +0200)
customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml patch | blob | history

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 39e2ed0c3f17f8fcc5c1a5a1b89ba9f49d2808e3..6dfae0c08f805eb6710100e9b5a638161fbee9db 100644 (file)
--- a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
@@ -212,13 +212,12 @@ infra::profile::apache::pp_vhosts:
         comment: '/opencms to /'
         rewrite_rule:
           - '^/opencms/(.*)$ /$1 [R,L]'
-    rewrites_non_ssl:
-      - proxy_non_https:
+      - https_forms:
         rewrite_cond:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-          - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
+          - '%%{ich-trickse}{REQUEST_URI} ^/(r|w|anmeldung|forms_retail|forms_wholesale)(/)? [NC]'
         rewrite_rule:
-          - '^(.*)$ http://localhost:8084/opencms$1 [P,L]'
+          - '^(.*)$ https://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L,QSA,NE]'
       - 404handler_non_https:
         comment: 'missing export to opencms'
         rewrite_cond:
@@ -227,13 +226,6 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{DOCUMENT_ROOT}%%{ich-trickse}{REQUEST_FILENAME} !-f'
         rewrite_rule:
           - '^(.*)$ http://localhost:8084/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]'
-    rewrites_ssl:
-      - 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:8085/opencms$1 [P,L]'
       - 404handle_https:
         comment: 'missing export to opencms'
         rewrite_cond:
@@ -242,6 +234,67 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{DOCUMENT_ROOT}%%{ich-trickse}{REQUEST_FILENAME} !-f'
         rewrite_rule:
           - '^(.*)$ http://localhost:8085/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.smart.de [R=301,L]'
+      - proxy_openemm:
+        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:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^/r/ http://localhost:8084/opencms/forms_retail/ [P,L]'
+      - proxy_forms_anmeldung_nonssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^/anmeldung http://localhost:8084/opencms/forms_wholesale/anmeldung [P,L]'
+      - proxy_forms_w_nonssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^/w/ http://localhost:8084/opencms/forms_wholesale/ [P,L]'
+      - proxy_forms_r_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/r/ http://localhost:8085/opencms/forms_retail/ [P,L]'
+      - proxy_forms_anmeldung_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/anmeldung http://localhost:8085/opencms/forms_wholesale/anmeldung [P,L]'
+      - proxy_forms_w_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/w/ http://localhost:8085/opencms/forms_wholesale/ [P,L]'
+      - proxy_forms_promo_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/w/abmeldung_promo http://localhost:8085/opencms/forms_wholesale/abmeldung_promo [P,L]'
+      - proxy_forms_trapo_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/anmeldung-transporter http://localhost:8085/opencms/forms_trapo_wholesale/anmeldung [P,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:8084/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:8085/opencms$1 [P,L]'
     proxy_preserve_host: true
     directories:
       - access-control-fonts:
@@ -263,14 +316,13 @@ infra::profile::apache::pp_vhosts:
       - opencms_to_slash:
         comment: '/opencms to /'
         rewrite_rule:
-                - '^/opencms/(.*)$ /$1 [R,L]'
-    rewrites_non_ssl:
-      - proxy_non_https:
+          - '^/opencms/(.*)$ /$1 [R,L]'
+      - https_forms:
         rewrite_cond:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-          - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
+          - '%%{ich-trickse}{REQUEST_URI} ^/(r|w|anmeldung|forms_retail|forms_wholesale)(/)? [NC]'
         rewrite_rule:
-          - '^(.*)$ http://localhost:8086/opencms$1 [P,L]'
+          - '^(.*)$ https://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L,QSA,NE]'
       - 404handler_non_https:
         comment: 'missing export to opencms'
         rewrite_cond:
@@ -279,13 +331,6 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{DOCUMENT_ROOT}%%{ich-trickse}{REQUEST_FILENAME} !-f'
         rewrite_rule:
           - '^(.*)$ http://localhost:8086/opencms/handle404?exporturi=%%{ich-trickse}{REQUEST_URI}&%%{ich-trickse}{QUERY_STRING} [P]'
-    rewrites_ssl:
-      - 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:8087/opencms$1 [P,L]'
       - 404handle_https:
         comment: 'missing export to opencms'
         rewrite_cond:
@@ -294,6 +339,67 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{DOCUMENT_ROOT}%%{ich-trickse}{REQUEST_FILENAME} !-f'
         rewrite_rule:
           - '^(.*)$ http://localhost:8087/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.truckworks.de [R=301,L]'
+      - proxy_openemm:
+        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:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^/r/ http://localhost:8086/opencms/forms_retail/ [P,L]'
+      - proxy_forms_anmeldung_nonssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^/anmeldung http://localhost:8086/opencms/forms_wholesale/anmeldung [P,L]'
+      - proxy_forms_w_nonssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^/w/ http://localhost:8086/opencms/forms_wholesale/ [P,L]'
+      - proxy_forms_r_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/r/ http://localhost:8087/opencms/forms_retail/ [P,L]'
+      - proxy_forms_anmeldung_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/anmeldung http://localhost:8087/opencms/forms_wholesale/anmeldung [P,L]'
+      - proxy_forms_w_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/w/ http://localhost:8087/opencms/forms_wholesale/ [P,L]'
+      - proxy_forms_promo_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/w/abmeldung_promo http://localhost:8087/opencms/forms_wholesale/abmeldung_promo [P,L]'
+      - proxy_forms_trapo_ssl:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} =on [NC]'
+        rewrite_rule:
+          - '^/anmeldung-transporter http://localhost:8087/opencms/forms_trapo_wholesale/anmeldung [P,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:8086/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:8087/opencms$1 [P,L]'
     proxy_preserve_host: true
     directories:
       - access-control-fonts:
Unnamed repository; edit this file 'description' to name the repository.