BERFBB-4277 tst

diff --git a/customer/fbb-web/development.yaml b/customer/fbb-web/development.yaml
index 732268ebadb6ca4c682d5e92fac859004e14813f..2aec0a95a33f986cafa01a6192814ef77ea60b26 100644 (file)
--- a/customer/fbb-web/development.yaml
+++ b/customer/fbb-web/development.yaml
@@ -98,7 +98,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
         - '217.66.56.0/24'
         - '194.174.72.0/21'
       deny: 'all'
-
     rewrite_to_https: true
     ssl: true
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
@@ -132,6 +131,16 @@ infra::profile::nginx_php_fpm_server::vhosts:
     rewrite_rules:
       - '/wp-admin$ $scheme://$host$uri/ permanent'
       - '/files/$ /index.php last'
+    vhost_cfg_prepend:
+      satisfy: 'any'
+      allow:
+        - '217.66.48.0/24'
+        - '217.66.49.0/24'
+        - '217.66.50.0/24'
+        - '217.66.51.0/24'
+        - '217.66.56.0/24'
+        - '194.174.72.0/21'
+      deny: 'all'
     ssl: true
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'

diff --git a/customer/fbb-web/test.yaml b/customer/fbb-web/test.yaml
index d92909adc8fcb2f6275cdd108b7f36fc0ede61f1..7e2c3f501b1d55c14f917226d477ade6be4d3146 100644 (file)
--- a/customer/fbb-web/test.yaml
+++ b/customer/fbb-web/test.yaml
@@ -152,6 +152,16 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - '%uri/'
       - '/index.php?$args'
     autoindex: 'on'
+    vhost_cfg_prepend:
+      satisfy: 'any'
+      allow:
+        - '217.66.48.0/24'
+        - '217.66.49.0/24'
+        - '217.66.50.0/24'
+        - '217.66.51.0/24'
+        - '217.66.56.0/24'
+        - '194.174.72.0/21'
+      deny: 'all'
   tst-berhub-berlin-airport-de_ssl:
     ensure: present
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
@@ -191,6 +201,16 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - '%uri/'
       - '/index.php?$args'
     autoindex: 'on'
+    vhost_cfg_prepend:
+      satisfy: 'any'
+      allow:
+        - '217.66.48.0/24'
+        - '217.66.49.0/24'
+        - '217.66.50.0/24'
+        - '217.66.51.0/24'
+        - '217.66.56.0/24'
+        - '194.174.72.0/21'
+      deny: 'all'
   tst-blog-berlin-airport-de:
     www_root: '/srv/www/tst-blog-berlin-airport-de'
     index_files:
@@ -224,6 +244,16 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - '%uri/'
       - '/index.php?$args'
     autoindex: 'on'
+    vhost_cfg_prepend:
+      satisfy: 'any'
+      allow:
+        - '217.66.48.0/24'
+        - '217.66.49.0/24'
+        - '217.66.50.0/24'
+        - '217.66.51.0/24'
+        - '217.66.56.0/24'
+        - '194.174.72.0/21'
+      deny: 'all'
   tst-blog-berlin-airport-de_ssl:
     www_root: '/srv/www/tst-blog-berlin-airport-de'
     index_files:
@@ -258,6 +288,16 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - '%uri/'
       - '/index.php?$args'
     autoindex: 'on'
+    vhost_cfg_prepend:
+      satisfy: 'any'
+      allow:
+        - '217.66.48.0/24'
+        - '217.66.49.0/24'
+        - '217.66.50.0/24'
+        - '217.66.51.0/24'
+        - '217.66.56.0/24'
+        - '194.174.72.0/21'
+      deny: 'all'
   tst-wifi-berlin-airport-de:
     www_root: '/srv/www/tst-wifi-berlin-airport-de'
     index_files: