From: Thomas Dalichow <thomas.dalichow@publicispixelpark.de>
Date: Thu, 3 May 2018 11:43:34 +0000 (+0200)
Subject: fbb - BERFBB-4583 prod (fix2)
X-Git-Tag: v0.1.0~1157^2~4
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=5674a52ce78ea33eda53feff4d455f94ac5386e3;p=pixelpark%2Fhiera.git

fbb - BERFBB-4583 prod (fix2)
---

diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index 467bc59c..a95d3020 100644
--- a/customer/fbb-www/production.yaml
+++ b/customer/fbb-www/production.yaml
@@ -437,8 +437,6 @@ infra::profile::apache::pp_vhosts:
       - laerm.berlin-airport.de
       - natur.berlin-airport.de
       - klima.berlin-airport.de
-      - mailings.berlin-airport.de
-      - mitarbeiterzeitung.berlin-airport.de
 
     rewrites:
       - comment: 'Subdomain werbung.berlin-airport.de'
@@ -664,16 +662,6 @@ infra::profile::apache::pp_vhosts:
           - '%{literal("%")}{HTTP_HOST} ^klima.berlin-airport.de$'
         rewrite_rule:
           - '^/.*$ http://www.berlin-airport.de/de/unternehmen/umwelt/klima-und-energie/index.php [R=301,NE,L]'
-      - comment: 'BERFBB-4583'
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^mailings.berlin-airport.de$'
-        rewrite_rule:
-          - '^/.*$ https://www.berlin-airport.de/de/global/mailings/index.php [R=301,NE,L]'
-      - comment: 'BERFBB-4583'
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^mitarbeiterzeitung.berlin-airport.de$'
-        rewrite_rule:
-          - '^/.*$ https://www.berlin-airport.de/de/global/mitarbeiterzeitung/index.php [R=301,NE,L]'
       - comment: 'default Startseite english'
         rewrite_cond:
           - '%{literal("%")}{HTTP:Accept-Language} ^en [NC]'
@@ -721,6 +709,8 @@ infra::profile::apache::pp_vhosts:
     serveraliases:
       - www.berlin-airport.de berlin-airport.de
       - gewinnspiel.berlin-airport.de
+      - mailings.berlin-airport.de
+      - mitarbeiterzeitung.berlin-airport.de
       - www01.berlin-airport.de
       - www02.berlin-airport.de
       # Pixelpark Domains
@@ -963,6 +953,17 @@ infra::profile::apache::pp_vhosts:
           - '%{literal("%")}{HTTP_HOST} ^gewinnspiel.berlin-airport.de$'
         rewrite_rule:
           - '^(.*)$ http://www.berlin-airport.de/de/global/ila-gewinnspiel [R=302,L]'
+      - comment: 'BERFBB-4583'
+        rewrite_cond:
+          - '%{literal("%")}{HTTP_HOST} ^mailings.berlin-airport.de$'
+        rewrite_rule:
+          - '^/.*$ https://www.berlin-airport.de/de/global/mailings/index.php [R=301,NE,L]'
+      - comment: 'BERFBB-4583'
+        rewrite_cond:
+          - '%{literal("%")}{HTTP_HOST} ^mitarbeiterzeitung.berlin-airport.de$'
+        rewrite_rule:
+          - '^/.*$ https://www.berlin-airport.de/de/global/mitarbeiterzeitung/index.php [R=301,NE,L]'
+
 
 #-----Neue Rewrites vor dieser Linie einfügen-----------------------------------------------------