From: sambufe <samuel.bufe@publicispixelpark.de>
Date: Thu, 27 Jul 2017 11:51:58 +0000 (+0200)
Subject: BERFBB-3340 test fix 2
X-Git-Tag: v0.1.0~2666^2~71
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c1f9d20eb5af657175910a760b4a7a1469d3f1b4;p=pixelpark%2Fhiera.git

BERFBB-3340 test fix 2
---

diff --git a/customer/fbb-web/test.yaml b/customer/fbb-web/test.yaml
index 65112137..f34598c5 100644
--- a/customer/fbb-web/test.yaml
+++ b/customer/fbb-web/test.yaml
@@ -255,6 +255,22 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - '^$|^/$ txl/ permanent'
       #      - '/wp-admin$ $scheme://$host$uri/ permanent'
       #      - '/files/$ /index.php last'
+    #BERFBB-3340
+    location_allow:
+      - '172.16.0.11/21'
+      - '172.16.8.0/21'
+      - '172.32.0.0/15'
+      - '172.34.0.0/15'
+      - '172.36.0.0/15'
+      - '172.38.0.0/16'
+      - '172.39.0.0/21'
+      - '172.16.40.0/19'
+      - '217.66.49.0/24'
+      - '217.66.50.0/24'
+      - '217.66.51.0/24'
+      - '217.66.56.0/24'
+    location_deny:
+      - 'all'
     client_max_body_size: '32M'
     listen_port: 80
     auth_basic: 'Server'
@@ -289,6 +305,22 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - '^([^.]*[^/])$ https://tst-wifi-berlin-airport-de.pixelpark.net$1/ permanent'
 #      - '/wp-admin$ $scheme://$host$uri/ permanent'
 #      - '/files/$ /index.php last'
+    #BERFBB-3340
+    location_allow:
+      - '172.16.0.11/21'
+      - '172.16.8.0/21'
+      - '172.32.0.0/15'
+      - '172.34.0.0/15'
+      - '172.36.0.0/15'
+      - '172.38.0.0/16'
+      - '172.39.0.0/21'
+      - '172.16.40.0/19'
+      - '217.66.49.0/24'
+      - '217.66.50.0/24'
+      - '217.66.51.0/24'
+      - '217.66.56.0/24'
+    location_deny:
+      - 'all'
     client_max_body_size: '32M'
     listen_port: 81
     auth_basic: 'Server'
@@ -382,42 +414,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
     autoindex: 'on'
 
 infra::profile::nginx_php_fpm_server::location:
-  'wifi':
-    vhost: 'tst-wifi-berlin-airport-de'
-    location: '/'
-    location_allow:
-      - '172.16.0.11/21'
-      - '172.16.8.0/21'
-      - '172.32.0.0/15'
-      - '172.34.0.0/15'
-      - '172.36.0.0/15'
-      - '172.38.0.0/16'
-      - '172.39.0.0/21'
-      - '172.16.40.0/19'
-      - '217.66.49.0/24'
-      - '217.66.50.0/24'
-      - '217.66.51.0/24'
-      - '217.66.56.0/24'
-    location_deny:
-      - 'all'
-  'wifi_ssl':
-    vhost: 'tst-wifi-berlin-airport-de_ssl'
-    location: '/'
-    location_allow:
-      - '172.16.0.11/21'
-      - '172.16.8.0/21'
-      - '172.32.0.0/15'
-      - '172.34.0.0/15'
-      - '172.36.0.0/15'
-      - '172.38.0.0/16'
-      - '172.39.0.0/21'
-      - '172.16.40.0/19'
-      - '217.66.49.0/24'
-      - '217.66.50.0/24'
-      - '217.66.51.0/24'
-      - '217.66.56.0/24'
-    location_deny:
-      - 'all'
   'favicon.ico_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
     vhost: tst-berhub-berlin-airport-de