BERFBB-3326 live

diff --git a/customer/fbb-web/production.yaml b/customer/fbb-web/production.yaml
index 385aa9d8ec16a0284d64fe709e1820a4dc2873cc..498ee6d5a20f95d212c8af863d65654f7968cc7f 100644 (file)
--- 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 6dd71a3a340cf5a7ff20dd79e4507a73f0450669..67ce0fbbb30bb0a47070e6638fc4d40016305a5f 100644 (file)
--- 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'