From 32d0f09b5e922c39bcba3d214e1e8b241639bb8b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20B=C3=B6ttcher?= Date: Thu, 30 Mar 2017 12:13:25 +0200 Subject: [PATCH] MHK - fix rewrite rules --- customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml | 9 +++++++-- customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml | 9 +++++++-- customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml index 96f370f3..ad9a7950 100644 --- 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 5623d052..3e051058 100644 --- 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 f5d5a77c..21d0f821 100644 --- 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]' -- 2.39.5