From: sambufe <samuel.bufe@publicispixelpark.de>
Date: Mon, 26 Jun 2017 14:36:43 +0000 (+0200)
Subject: FBBKERNSERV-238 trailing slash fix 2
X-Git-Tag: v0.1.0~2757
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=00f05096fb69fbe68f2fad0e09e4339cd27cae8d;p=pixelpark%2Fhiera.git

FBBKERNSERV-238 trailing slash fix 2
---

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index 8cacb651..eada7dca 100644
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -276,20 +276,6 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{REQUEST_URI} !^/media.*$'
         rewrite_rule:
           - '(^.*/$|^$) $1index.php [L,R=301]'
-      - comment: 'FBBKERNSERV-238'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} ^/xmas$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/webteam$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/starsberlin$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/securitastxl$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/securitas$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/bgstxl$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/bgssxf$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/ofis$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/airberlinhub$'
-          - '%%{ich-trickse}{REQUEST_URI} ^/media$'
-        rewrite_rule:
-          - '(^.*/$|^$) $1/ [L,R=301]'
       - comment: 'Subdomain werbung.berlin-airport.de'
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^advertising.berlin-airport.de$'
@@ -802,10 +788,10 @@ infra::profile::apache::pp_vhosts:
           - '.? - [L]'
       - comment: 'ansonsten, falls HTTPS dann auf HTTP weiterleiten und abbrechen'
         rewrite_rule:
-          - '^(.*)$ http://tst.berlin-airport.de$1 [R=301,L]'
+          - '^(.*)$ http://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L]'
       - comment: 'Regel fuer SSL-Bereich: wenn HTTP dann auf HTTPS weiterleiten und abbrechen'
         rewrite_cond:
           - '%%{ich-trickse}{HTTP:Https} !on'
           - '%%{ich-trickse}{HTTPS} off'
         rewrite_rule:
-          - '^(.*)$ https://tst.berlin-airport.de$1 [R=301,L]'
+          - '^(.*)$ https://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L]'