ODT - fix rewrites

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 f2fdf9c3b726c4682a96aca411481ec1ef3daaa1..71fea58c4897da771adc65a6b756e9c49313cf65 100644 (file)
--- a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
@@ -101,7 +101,7 @@ infra::profile::apache::pp_vhosts:
       - https_forms:
         rewrite_cond:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-          - '%%{ich-trickse}{REQUEST_URI} ^/(r|w|anmeldung|forms_retail|forms_wholesale)(/)? [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:
@@ -217,7 +217,7 @@ infra::profile::apache::pp_vhosts:
       - https_forms:
         rewrite_cond:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-          - '%%{ich-trickse}{REQUEST_URI} ^/(r|w|anmeldung|forms_retail|forms_wholesale)(/)? [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:
@@ -323,7 +323,7 @@ infra::profile::apache::pp_vhosts:
       - https_forms:
         rewrite_cond:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-          - '%%{ich-trickse}{REQUEST_URI} ^/(r|w|anmeldung|forms_retail|forms_wholesale)(/)? [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: