From: sambufe <samuel.bufe@publicispixelpark.de>
Date: Tue, 6 Jun 2017 11:46:22 +0000 (+0200)
Subject: FBBKERNSERV-144
X-Git-Tag: v0.1.0~2852^2~2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=49b03cda7dfdaa04ee8b8a120f1be90b5fe29669;p=pixelpark%2Fhiera.git

FBBKERNSERV-144
---

diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index ea8ff9b0..fc0d791b 100644
--- a/customer/fbb-www/production.yaml
+++ b/customer/fbb-www/production.yaml
@@ -51,6 +51,8 @@ infra::profile::apache::pp_vhosts:
       - travelnews.berlin-airport.de
       - ber.berlin-airport.de
       - dialogforum-ber.de
+      - m.berlin-airport.de
+      - real-estate.berlin-airport.de
     ssl: false
     default_vhost: true
     docroot_owner: apache
@@ -77,6 +79,16 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{HTTP_HOST} ^dialogforum-ber.de'
         rewrite_rule:
           - '^/.*$ https://www.dialogforum-ber.de/$1 [R=301,L]'
+      - comment: 'FBBKERNSERV-144'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP_HOST} ^m.berlin-airport.de'
+        rewrite_rule:
+          - '^/.*$ http://www.berlin-airport.de/ [R=301,L]'
+      - comment: 'FBBKERNSERV-100 real-estate'
+        rewrite_cond:
+        - '%%{ich-trickse}{HTTP_HOST} ^real-estate.berlin-airport.de$'
+        rewrite_rule:
+        - '^/(.*)$ http://www.berlin-airport.de/de/geschaeftspartner/flaechen-u-immobilien/index.php [R=301,L]'
 #Rewrites aus HTTPD Conf FBBKERNSERV-143
       - rewrite_cond:
         - '%%{ich-trickse}{HTTP:Accept-Language} ^de [NC]'
diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index aa507c8e..80c76684 100644
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -49,8 +49,7 @@ infra::profile::apache::pp_vhosts:
       - tst.berlin-airport.de
       - tst01.berlin-airport.de
       - tst02.berlin-airport.de
-      - dialogforum-ber.de
-      - real-estate.berlin-airport.de
+      - tstm.berlin-airport.de
     ssl: false
     default_vhost: true
     docroot_owner: apache
@@ -72,16 +71,6 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
     rewrites:
-      - comment: 'FBBKERNSERV-100 real-estate'
-        rewrite_cond:
-        - '%%{ich-trickse}{HTTP_HOST} ^real-estate.berlin-airport.de$'
-        rewrite_rule:
-        - '^/(.*)$ http://www.berlin-airport.de/de/geschaeftspartner/flaechen-u-immobilien/index.php [R=301,L]'
-      - comment: 'FBBKERNSERV-101'
-        rewrite_cond:
-        - '%%{ich-trickse}{HTTP_HOST} ^dialogforum-ber.de$'
-        rewrite_rule:
-        - '^(.*)$ https://www.dialogforum-ber.de/$1 [R=301,L]'
 #Rewrites aus HTTPD Conf FBBKERNSERV-143
       - rewrite_cond:
         - '%%{ich-trickse}{HTTP:Accept-Language} ^de [NC]'