]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
MHK - stage rewrites
authorOliver Böttcher <oliver.boettcher@pixelpark.com>
Thu, 27 Apr 2017 08:28:40 +0000 (10:28 +0200)
committerOliver Böttcher <oliver.boettcher@pixelpark.com>
Thu, 27 Apr 2017 08:28:40 +0000 (10:28 +0200)
customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml

index 9a4e2c533f119378f603be2c3dd3167d7bdc5bf8..fda3e133ef16138cba966e55978674128986523c 100644 (file)
@@ -22,8 +22,15 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]'
-      - index:
-        comment: 'Coremedia Rewrites'
+      - comment: 'Redirects'
+        rewrite_rule:
+          - '^(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE [R=301,L]'
+          - '^/newsletter(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
+          - '^/kundenmagazin(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
+          - '^/checkliste(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/vorbereitung [R=301,L]'
+          - '^/haendlersuche(/)?$ https://%%{ich-trickse}{SERVER_NAME}/action/de-DE/116/action/vendor-search [R=301,L]'
+          - '^/planungskit(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
+      - comment: 'Coremedia Rewrites'
         rewrite_rule:
           - '^/login/(.*) /blueprint/servlet/login/$1 [PT,L]'
           - '^/action/(.*) /blueprint/servlet/action/$1 [PT,L]'
@@ -48,11 +55,11 @@ infra::profile::apache::pp_vhosts:
           - '^/server-status - [L]'
           - '^/robots.txt /blueprint/servlet/robots/de-DE [PT,L]'
           - '^/blueprint/(.*) /blueprint/$1 [PT,L]'
-          - '^/de-DE/(.*)$ //blueprint/servlet/page/de-DE/$1 [PT,L]'
-          - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
+          - '^/de-DE/(.*)$ /blueprint/servlet/page/de-DE/$1 [PT,L]'
           - '^/errors/(.*)$ /var/www/mhk/errors/$1 [L]'
           - '^/assets/(.*)$ /var/www/mhk/errors/assets/$1 [L]'
           - '^/traumkueche/(.*)$ /var/www/mhk/traumkueche/$1 [L]'
+          - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/(.*) /blueprint/servlet/page/de-DE/$1 [PT,L]'
     proxy_preserve_host: true
     proxy_pass:
index 159420a65c3600783f4d9fe8ee11a67558604818..7f7706a56756ae2e846bdcae2c4a4f675d07adcc 100644 (file)
@@ -22,8 +22,15 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]'
-      - index:
-        comment: 'Coremedia Rewrites'
+      - comment: 'Redirects'
+        rewrite_rule:
+          - '^(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE [R=301,L]'
+          - '^/newsletter(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
+          - '^/kundenmagazin(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
+          - '^/checkliste(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/vorbereitung [R=301,L]'
+          - '^/haendlersuche(/)?$ https://%%{ich-trickse}{SERVER_NAME}/action/de-DE/116/action/vendor-search [R=301,L]'
+          - '^/planungskit(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
+      - comment: 'Coremedia Rewrites'
         rewrite_rule:
           - '^/login/(.*) /blueprint/servlet/login/$1 [PT,L]'
           - '^/action/(.*) /blueprint/servlet/action/$1 [PT,L]'
@@ -48,11 +55,11 @@ infra::profile::apache::pp_vhosts:
           - '^/server-status - [L]'
           - '^/robots.txt /blueprint/servlet/robots/de-DE [PT,L]'
           - '^/blueprint/(.*) /blueprint/$1 [PT,L]'
-          - '^/de-DE/(.*)$ //blueprint/servlet/page/de-DE/$1 [PT,L]'
-          - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
+          - '^/de-DE/(.*)$ /blueprint/servlet/page/de-DE/$1 [PT,L]'
           - '^/errors/(.*)$ /var/www/mhk/errors/$1 [L]'
           - '^/assets/(.*)$ /var/www/mhk/errors/assets/$1 [L]'
           - '^/traumkueche/(.*)$ /var/www/mhk/traumkueche/$1 [L]'
+          - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/(.*) /blueprint/servlet/page/de-DE/$1 [PT,L]'
     proxy_preserve_host: true
     proxy_pass:
index 8b58c99722b11789443e1a55959ee545dabd1c5e..1fd0e1617d33a83dc1b73769ef84af13b46f6008 100644 (file)
@@ -22,8 +22,15 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]'
-      - index:
-        comment: 'Coremedia Rewrites'
+      - comment: 'Redirects'
+        rewrite_rule:
+          - '^(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE [R=301,L]'
+          - '^/newsletter(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
+          - '^/kundenmagazin(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
+          - '^/checkliste(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/vorbereitung [R=301,L]'
+          - '^/haendlersuche(/)?$ https://%%{ich-trickse}{SERVER_NAME}/action/de-DE/116/action/vendor-search [R=301,L]'
+          - '^/planungskit(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
+      - comment: 'Coremedia Rewrites'
         rewrite_rule:
           - '^/login/(.*) /blueprint/servlet/login/$1 [PT,L]'
           - '^/action/(.*) /blueprint/servlet/action/$1 [PT,L]'
@@ -48,11 +55,11 @@ infra::profile::apache::pp_vhosts:
           - '^/server-status - [L]'
           - '^/robots.txt /blueprint/servlet/robots/de-DE [PT,L]'
           - '^/blueprint/(.*) /blueprint/$1 [PT,L]'
-          - '^/de-DE/(.*)$ //blueprint/servlet/page/de-DE/$1 [PT,L]'
-          - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
+          - '^/de-DE/(.*)$ /blueprint/servlet/page/de-DE/$1 [PT,L]'
           - '^/errors/(.*)$ /var/www/mhk/errors/$1 [L]'
           - '^/assets/(.*)$ /var/www/mhk/errors/assets/$1 [L]'
           - '^/traumkueche/(.*)$ /var/www/mhk/traumkueche/$1 [L]'
+          - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/(.*) /blueprint/servlet/page/de-DE/$1 [PT,L]'
     proxy_preserve_host: true
     proxy_pass: