]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
GRIDPARK-4137 on test part 2
authorsambufe <samuel.bufe@publicispixelpark.de>
Thu, 14 Sep 2017 13:23:25 +0000 (15:23 +0200)
committersambufe <samuel.bufe@publicispixelpark.de>
Thu, 14 Sep 2017 13:23:25 +0000 (15:23 +0200)
customer/fbb-web/test.yaml

index a01b91585e754e6b77381ad4bbccc4c70eb25d9c..c3007be5bf35b8324a94c5ce0a909635e139662a 100644 (file)
@@ -769,166 +769,167 @@ infra::profile::nginx_php_fpm_server::location:
       fastcgi_pass: '127.0.0.1:9000'
       fastcgi_index: 'index.php'
       fastcgi_param: 'HTTPS on'
-  'favicon.ico_ila':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de
-    location: '/favicon.ico'
-    ensure: present
-    index_files:
-      - 'index.php'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-  'robots.txt_ila':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de
-    location: '/robots.txt'
-    ensure: present
-    index_files:
-      - 'index.php'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-      allow: 'all'
-  'hidden-files_ila':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de
-    ensure: present
-    index_files:
-      - 'index.php'
-    location: '~ /\.'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-      deny: 'all'
-  'images_ila':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de
-    location: '~* "^.+\.(jpg|jpeg|gif|png|ico|)$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-      expires: 'max'
-  'files_ila':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-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:
-      - 'index.php'
-    location_custom_cfg:
-      log_not_found: 'off'
-      expires: 'max'
-  'all-files_ila':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de
-    location: '~ "\*$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    try_files:
-      - '$uri =404'
-  'php-files_ila':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de
-    location: '~ "\.php$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    try_files:
-      - '$uri =404'
-    include:
-      - '/etc/nginx/fastcgi.conf'
-    fastcgi_param:
-      SCRIPT_FILENAME: '$document_root$fastcgi_script_name'
-    location_cfg_append:
-      fastcgi_read_timeout: '3600s'
-      fastcgi_buffer_size: '128k'
-      fastcgi_buffers: '4 128k'
-      fastcgi_pass: '127.0.0.1:9000'
-      fastcgi_index: 'index.php'
-  'favicon.ico_ila_ssl':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de_ssl
-    location: '/favicon.ico'
-    ensure: present
-    index_files:
-      - 'index.php'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-  'robots.txt_ila_ssl':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de_ssl
-    location: '/robots.txt'
-    ensure: present
-    index_files:
-      - 'index.php'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-      allow: 'all'
-  'hidden-files_ila_ssl':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de_ssl
-    ensure: present
-    index_files:
-      - 'index.php'
-    location: '~ /\.'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-      deny: 'all'
-  'images_ila_ssl':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de_ssl
-    location: '~* "^.+\.(jpg|jpeg|gif|png|ico|)$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    try_files:
-      - '$uri'
-      - '%uri/'
-      - '/index.php'
-  'files_ila_ssl':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-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:
-      - 'index.php'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-      expires: 'max'
-  'all-files_ila_ssl':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de_ssl
-    location: '~ "\*$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    try_files:
-      - '$uri =404'
-  'php-files_ila_ssl':
-    www_root: '/srv/www/tst-ila-berlin-airport-de'
-    vhost: tst-ila-berlin-airport-de_ssl
-    location: '~ "\.php$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    try_files:
-      - '$uri =404'
-    include:
-      - '/etc/nginx/fastcgi.conf'
-    fastcgi_param:
-      SCRIPT_FILENAME: '$document_root$fastcgi_script_name'
-    location_cfg_append:
-      fastcgi_read_timeout: '3600s'
-      fastcgi_buffer_size: '128k'
-      fastcgi_buffers: '4 128k'
-      fastcgi_pass: '127.0.0.1:9000'
-      fastcgi_index: 'index.php'
+  ## siehe: GRIDPARK-4137
+  # 'favicon.ico_ila':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de
+  #   location: '/favicon.ico'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   location_custom_cfg:
+  #     access_log: 'off'
+  #     log_not_found: 'off'
+  # 'robots.txt_ila':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de
+  #   location: '/robots.txt'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   location_custom_cfg:
+  #     access_log: 'off'
+  #     log_not_found: 'off'
+  #     allow: 'all'
+  # 'hidden-files_ila':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   location: '~ /\.'
+  #   location_custom_cfg:
+  #     access_log: 'off'
+  #     log_not_found: 'off'
+  #     deny: 'all'
+  # 'images_ila':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de
+  #   location: '~* "^.+\.(jpg|jpeg|gif|png|ico|)$"'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   location_custom_cfg:
+  #     access_log: 'off'
+  #     log_not_found: 'off'
+  #     expires: 'max'
+  # 'files_ila':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-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:
+  #     - 'index.php'
+  #   location_custom_cfg:
+  #     log_not_found: 'off'
+  #     expires: 'max'
+  # 'all-files_ila':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de
+  #   location: '~ "\*$"'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   try_files:
+  #     - '$uri =404'
+  # 'php-files_ila':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de
+  #   location: '~ "\.php$"'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   try_files:
+  #     - '$uri =404'
+  #   include:
+  #     - '/etc/nginx/fastcgi.conf'
+  #   fastcgi_param:
+  #     SCRIPT_FILENAME: '$document_root$fastcgi_script_name'
+  #   location_cfg_append:
+  #     fastcgi_read_timeout: '3600s'
+  #     fastcgi_buffer_size: '128k'
+  #     fastcgi_buffers: '4 128k'
+  #     fastcgi_pass: '127.0.0.1:9000'
+  #     fastcgi_index: 'index.php'
+  # 'favicon.ico_ila_ssl':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de_ssl
+  #   location: '/favicon.ico'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   location_custom_cfg:
+  #     access_log: 'off'
+  #     log_not_found: 'off'
+  # 'robots.txt_ila_ssl':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de_ssl
+  #   location: '/robots.txt'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   location_custom_cfg:
+  #     access_log: 'off'
+  #     log_not_found: 'off'
+  #     allow: 'all'
+  # 'hidden-files_ila_ssl':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de_ssl
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   location: '~ /\.'
+  #   location_custom_cfg:
+  #     access_log: 'off'
+  #     log_not_found: 'off'
+  #     deny: 'all'
+  # 'images_ila_ssl':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de_ssl
+  #   location: '~* "^.+\.(jpg|jpeg|gif|png|ico|)$"'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   try_files:
+  #     - '$uri'
+  #     - '%uri/'
+  #     - '/index.php'
+  # 'files_ila_ssl':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-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:
+  #     - 'index.php'
+  #   location_custom_cfg:
+  #     access_log: 'off'
+  #     log_not_found: 'off'
+  #     expires: 'max'
+  # 'all-files_ila_ssl':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de_ssl
+  #   location: '~ "\*$"'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   try_files:
+  #     - '$uri =404'
+  # 'php-files_ila_ssl':
+  #   www_root: '/srv/www/tst-ila-berlin-airport-de'
+  #   vhost: tst-ila-berlin-airport-de_ssl
+  #   location: '~ "\.php$"'
+  #   ensure: present
+  #   index_files:
+  #     - 'index.php'
+  #   try_files:
+  #     - '$uri =404'
+  #   include:
+  #     - '/etc/nginx/fastcgi.conf'
+  #   fastcgi_param:
+  #     SCRIPT_FILENAME: '$document_root$fastcgi_script_name'
+  #   location_cfg_append:
+  #     fastcgi_read_timeout: '3600s'
+  #     fastcgi_buffer_size: '128k'
+  #     fastcgi_buffers: '4 128k'
+  #     fastcgi_pass: '127.0.0.1:9000'
+  #     fastcgi_index: 'index.php'