Bugfixing customer/fbb-web/test.yaml because of new nginx module

diff --git a/customer/fbb-web/test.yaml b/customer/fbb-web/test.yaml
index 3c7fe1ab778565ab4d435438d3e0788767d79b17..82210748a932b662832d1acc441f5ee4c7578db1 100644 (file)
--- a/customer/fbb-web/test.yaml
+++ b/customer/fbb-web/test.yaml
@@ -296,7 +296,7 @@ infra::profile::nginx_php_fpm_server::vhosts:
 infra::profile::nginx_php_fpm_server::location:
   'favicon.ico_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de
+    server: tst-berhub-berlin-airport-de
     location: '/favicon.ico'
     ensure: present
     index_files:
@@ -306,7 +306,7 @@ infra::profile::nginx_php_fpm_server::location:
       log_not_found: 'off'
   'robots.txt_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de
+    server: tst-berhub-berlin-airport-de
     location: '/robots.txt'
     ensure: present
     index_files:
@@ -317,7 +317,7 @@ infra::profile::nginx_php_fpm_server::location:
       allow: 'all'
   'hidden-files_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de
+    server: tst-berhub-berlin-airport-de
     ensure: present
     index_files:
       - 'index.php'
@@ -328,7 +328,7 @@ infra::profile::nginx_php_fpm_server::location:
       deny: 'all'
   'images_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de
+    server: tst-berhub-berlin-airport-de
     location: '~* "^.+\.(jpg|jpeg|gif|png|ico|)$"'
     ensure: present
     index_files:
@@ -339,7 +339,7 @@ infra::profile::nginx_php_fpm_server::location:
       expires: 'max'
   'files_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de
+    server: tst-berhub-berlin-airport-de
     location: '~* "^.+\.(ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|rss|atom|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf)$"'
     ensure: present
     index_files:
@@ -349,7 +349,7 @@ infra::profile::nginx_php_fpm_server::location:
       expires: 'max'
   'all-files_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de
+    server: tst-berhub-berlin-airport-de
     location: '~ "\*$"'
     ensure: present
     index_files:
@@ -358,7 +358,7 @@ infra::profile::nginx_php_fpm_server::location:
       - '$uri =404'
   'php-files_berhub':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de
+    server: tst-berhub-berlin-airport-de
     location: '~ "\.php$"'
     ensure: present
     index_files:
@@ -377,7 +377,7 @@ infra::profile::nginx_php_fpm_server::location:
       fastcgi_index: 'index.php'
   'favicon.ico_berhub_ssl':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de_ssl
+    server: tst-berhub-berlin-airport-de_ssl
     location: '/favicon.ico'
     ensure: present
     index_files:
@@ -387,7 +387,7 @@ infra::profile::nginx_php_fpm_server::location:
       log_not_found: 'off'
   'robots.txt_berhub_ssl':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de_ssl
+    server: tst-berhub-berlin-airport-de_ssl
     location: '/robots.txt'
     ensure: present
     index_files:
@@ -398,7 +398,7 @@ infra::profile::nginx_php_fpm_server::location:
       allow: 'all'
   'hidden-files_berhub_ssl':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de_ssl
+    server: tst-berhub-berlin-airport-de_ssl
     ensure: present
     index_files:
       - 'index.php'
@@ -409,7 +409,7 @@ infra::profile::nginx_php_fpm_server::location:
       deny: 'all'
   'images_berhub_ssl':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de_ssl
+    server: tst-berhub-berlin-airport-de_ssl
     location: '~* "^.+\.(jpg|jpeg|gif|png|ico|)$"'
     ensure: present
     index_files:
@@ -420,7 +420,7 @@ infra::profile::nginx_php_fpm_server::location:
       - '/index.php'
   'files_berhub_ssl':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de_ssl
+    server: tst-berhub-berlin-airport-de_ssl
     location: '~* "^.+\.(ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|rss|atom|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf)$"'
     ensure: present
     index_files:
@@ -431,7 +431,7 @@ infra::profile::nginx_php_fpm_server::location:
       expires: 'max'
   'all-files_berhub_ssl':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de_ssl
+    server: tst-berhub-berlin-airport-de_ssl
     location: '~ "\*$"'
     ensure: present
     index_files:
@@ -440,7 +440,7 @@ infra::profile::nginx_php_fpm_server::location:
       - '$uri =404'
   'php-files_berhub_ssl':
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de_ssl
+    server: tst-berhub-berlin-airport-de_ssl
     location: '~ "\.php$"'
     ensure: present
     index_files: