MHK - fix rewrite rules

diff --git a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
index 96f370f36d9d4ef6988680a6afea899c40ccf2b8..ad9a7950f85bd4da3aee2b7864a6e4df58da27ae 100644 (file)
--- a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
@@ -72,9 +72,14 @@ site::profile::apache::pp_vhosts:
     rewrites:
       - nonwww:
         rewrite_cond:
-          - '%%{ich-trickse}{HTTP_HOST} ^(.*).kueche.de$ [NC]'
+          - '%%{ich-trickse}{HTTP_HOST} ^(.*)\.kueche\.de$ [NC]'
         rewrite_rule:
           - '^(.*)$ http://kueche.de$1 [R=301,L]'
+      - nonwww2:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP_HOST} ^www-kueche-de\.pixelpark\.net$ [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://www-kueche-de.pixelpark.net$1 [R=301,L]'
       - to_ssl:
         comment: 'all to https'
         rewrite_cond:
@@ -100,7 +105,7 @@ site::profile::apache::pp_vhosts:
           - '^/elastic/image(.*) /blueprint/servlet/elastic/image$1 [PT,L]'
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
-          - '^/de-DE(/)?$ / [R,L]'
+          #- '^/de-DE(/)?$ / [R,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
           - '^/sitemap_index.xml  /var/www/mhk/sitemap/Sites/MHK/sitemap_index.xml  [L]'

diff --git a/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
index 5623d05209c73c5090b5e10c53be6cfcde848366..3e05105831f3814f3f652ea9ac3eb8d54857855c 100644 (file)
--- a/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
@@ -63,9 +63,14 @@ site::profile::apache::pp_vhosts:
     rewrites:
       - nonwww:
         rewrite_cond:
-          - '%%{ich-trickse}{HTTP_HOST} ^(.*).kueche.de$ [NC]'
+          - '%%{ich-trickse}{HTTP_HOST} ^(.*)\.kueche\.de$ [NC]'
         rewrite_rule:
           - '^(.*)$ http://kueche.de$1 [R=301,L]'
+      - nonwww2:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP_HOST} ^www-kueche-de\.pixelpark\.net$ [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://www-kueche-de.pixelpark.net$1 [R=301,L]'
       - to_ssl:
         comment: 'all to https'
         rewrite_cond:
@@ -91,7 +96,7 @@ site::profile::apache::pp_vhosts:
           - '^/elastic/image(.*) /blueprint/servlet/elastic/image$1 [PT,L]'
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
-          - '^/de-DE(/)?$ / [R,L]'
+          #- '^/de-DE(/)?$ / [R,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
           - '^/sitemap_index.xml  /var/www/mhk/sitemap/Sites/MHK/sitemap_index.xml  [L]'

diff --git a/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
index f5d5a77cbc6afcafd3d38d585e701a0641acb99d..21d0f821bb0ea208d27e9a32b8b058699dfffdd9 100644 (file)
--- a/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
@@ -63,9 +63,14 @@ site::profile::apache::pp_vhosts:
     rewrites:
       - nonwww:
         rewrite_cond:
-          - '%%{ich-trickse}{HTTP_HOST} ^(.*).kueche.de$ [NC]'
+          - '%%{ich-trickse}{HTTP_HOST} ^(.*)\.kueche\.de$ [NC]'
         rewrite_rule:
           - '^(.*)$ http://kueche.de$1 [R=301,L]'
+      - nonwww2:
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP_HOST} ^www-kueche-de\.pixelpark\.net$ [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://www-kueche-de.pixelpark.net$1 [R=301,L]'
       - to_ssl:
         comment: 'all to https'
         rewrite_cond:
@@ -91,7 +96,7 @@ site::profile::apache::pp_vhosts:
           - '^/elastic/image(.*) /blueprint/servlet/elastic/image$1 [PT,L]'
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
-          - '^/de-DE(/)?$ / [R,L]'
+          #- '^/de-DE(/)?$ / [R,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
           - '^/sitemap_index.xml  /var/www/mhk/sitemap/Sites/MHK/sitemap_index.xml  [L]'