From: sambufe <samuel.bufe@publicispixelpark.de>
Date: Tue, 2 May 2017 08:05:54 +0000 (+0200)
Subject: BERFBB-3326 live
X-Git-Tag: v0.1.0~3090
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=2a6e6b9abddd52d363613d25470890e1027e4086;p=pixelpark%2Fhiera.git

BERFBB-3326 live
---

diff --git a/customer/fbb-web/production.yaml b/customer/fbb-web/production.yaml
index 385aa9d8..498ee6d5 100644
--- a/customer/fbb-web/production.yaml
+++ b/customer/fbb-web/production.yaml
@@ -236,7 +236,11 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - 'wifi.berlin-airport.de'
       - 'wifi01.berlin-airport.de'
       - 'wifi02.berlin-airport.de'
-#    rewrite_rules:
+    rewrite_rules:
+      #BERFBB-3339
+      -  '^#/(.*) $1 permanent'
+      #BERFBB-3240
+      - '^$|^/$ txl/ permanent'
 #      - '/wp-admin$ $scheme://$host$uri/ permanent'
 #      - '/files/$ /index.php last'
     client_max_body_size: '32M'
@@ -270,7 +274,11 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - 'wifi.berlin-airport.de'
       - 'wifi01.berlin-airport.de'
       - 'wifi02.berlin-airport.de'
-#    rewrite_rules:
+    rewrite_rules:
+      #BERFBB-3339
+      -  '^#/(.*) $1 permanent'
+      #BERFBB-3240
+      - '^$|^/$ txl/ permanent'
 #      - '/wp-admin$ $scheme://$host$uri/ permanent'
 #      - '/files/$ /index.php last'
     client_max_body_size: '32M'
diff --git a/customer/fbb-web/test.yaml b/customer/fbb-web/test.yaml
index 6dd71a3a..67ce0fbb 100644
--- a/customer/fbb-web/test.yaml
+++ b/customer/fbb-web/test.yaml
@@ -284,8 +284,10 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - 'tst01-wifi-berlin-airport-de.pixelpark.net'
       - 'tst02-wifi-berlin-airport-de.pixelpark.net'
     rewrite_rules:
+      #BERFBB-3339
+      -  '^#/(.*) $1 permanent'
       #BERFBB-3240
-      - '^$|^/$ https://tst-wifi-berlin-airport-de.pixelpark.net/txl/ permanent'
+      - '^$|^/$ txl/ permanent'
 #      - '/wp-admin$ $scheme://$host$uri/ permanent'
 #      - '/files/$ /index.php last'
     client_max_body_size: '32M'