From 4191ade1628aa18ab7441fe4a20af196074649d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20B=C3=B6ttcher?= Date: Thu, 27 Apr 2017 10:28:40 +0200 Subject: [PATCH] MHK - stage rewrites --- .../stage-www01-mhk-kueche-de.pixelpark.net.yaml | 15 +++++++++++---- .../stage-www02-mhk-kueche-de.pixelpark.net.yaml | 15 +++++++++++---- .../stage-www03-mhk-kueche-de.pixelpark.net.yaml | 15 +++++++++++---- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml index 9a4e2c53..fda3e133 100644 --- a/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml +++ b/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml @@ -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: diff --git a/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml index 159420a6..7f7706a5 100644 --- a/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml +++ b/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml @@ -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: diff --git a/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml index 8b58c997..1fd0e161 100644 --- a/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml +++ b/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml @@ -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: -- 2.39.5