fbb-web - remove superfluous comments

diff --git a/customer/fbb-web/test.yaml b/customer/fbb-web/test.yaml
index ad76938b507521d69d9bfe8e5d8085c96e020a85..cbd0f4927516d27de7adacbc29ad0e625ca823da 100644 (file)
--- a/customer/fbb-web/test.yaml
+++ b/customer/fbb-web/test.yaml
@@ -50,14 +50,6 @@ accounts::users:
   christian.schoenherr:
     apply: true
     sudo: true
-# https://jira.pixelpark.com/jira/browse/PPPUPPET-239
-#  service.darksite:
-#    uid: 60186
-#    apply: true
-#    sudo: false
-#    comment: "Service-User-Darkside"
-#    key: "AAAAB3NzaC1kc3MAAACBANtL0m4qOL4mU1h014HAo3Au97ahDgSfWtQFHz6/XMB5TLaOIssPiN7K28/CadZIdj1yC62uxW6MnmgsAfo15c3+GW2p3XJxjWm8a+jefDejUFBUA4mVg0/EvAF0mDVB9t1BtLvGDUWTca3r3N1TPBULDcEpimsaQqeMapMwQ4kxAAAAFQDxShJd9+FfgaG5KemaYSBQiPzvdwAAAIBDnZYxz9CxKXvl0fEmoVWa7aMoQdWtaNtu59kT+zsuEa68asE14gAeR9dl4ctqQuXBsy8/fyK/9heZDROFi6AV5R7AeLc/eXOT7m5T0CQNDoBoyK63p/S38BQ8YR8Q6RfO9E2D5XbWjDvI8YG44VnuTNO2wKt+n34qRblhuAh6gQAAAIAJ/tbzg+xynMx5jqigcp3+oFKSGYJZidlw7t6q5LOgQLhSkEB+Xo9YH6y7JlsWVlYUTeYVGDH+EGs7/Q2XD80LSB7mbQRNRiFeyQ7+kxMa/fcHgS0Kj7MTEC/qPvuOxRmyMnuoJafl/KCdPuiS8VcsuOTjgC39QMLUMsBDwKgd/g=="
-#    ssh_type: 'dsa'
 
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVEnDEuZKy7xtfPvCGgTIgYEQ5Pca+udKFnxB5h3JSd6wuelU/p+cAAqGQVL1kCNZFJljAX479eZRp29bB0B8C22xWM+dsiOFRAiDKDPlVLRH96kysQC9im9MR4Qz5orcxEIUUQ3v5bWeQChEhhf+CJSBY7NoJcXEnI5urWMTZAKjtIhPrbT+VWnBz//7sBBQyiKPmdUkowyUG0n2H2kz2ss7F9P8SH6KPuhaCHK5dU1IsxAdQyrDToiaTu6qOCGpddlYY9xSJLtD9kx0kH3ynL/MHQWEfDVtVcdVltVRibAyU9D3SN8mUDj8JUuVIyenSGaqyzsXSnDzEjQqj5vGBTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCu7MS7qNeEKG8vYdt2/SQpgBC546WyJQC7GTYh4T7wzeah]
 infra::profile::mysql_server::databases:
@@ -67,10 +59,6 @@ infra::profile::mysql_server::databases:
   ber-hub:
     user: ber-hub
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAMN7GubBn7dE8UiWLhEPyzDxBlEukF46CznsHHxLWxB101NbnQLfKFPGO5J8h1Of3Dx21SKZ5CQS7phmnuLcuwBUCm4HIZjs/bqobbWGMjGYVqYyqImr8IiXQGiPhnt9fGEURg6nS3YHIBHSlcrWWn/d+ymKSzfWFfRBBXfXCelf7mO2rhCcuBr4OLt8fDCfwaWtNqoqw2YPInnIXOrN3PEp20Dgc25G8XLPX94JMspV9mcwRluusEF1FcbZeY7pvlNGsZLtx6sk49Ax8oDJMbwx8SldodHoTnRMOiY33aRMfNwVney5zcsTqUeqlEIyKsGcBNCoYDLqCVBSbynpQ/zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDCBLQFvhVd56rSHj3lQ3GGgBCsUvv+IdSAKytz2noF2O1P]
-#siehe: GRIDPARK-4137
-#  ila:
-#    user: ila
-#    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXzWF7KW8zqDh9IBcK5sEut6YUoRGvEvihrHaEwp1Hpcto6AvTX2n9Gnz7RDLNrPri052Fs4jZkYAV7TpHrXdQuHzdGOU0uL7yHzFSB8u1RSHuZu9SlD/MIbvgvvlHzNZnDNW5OdehGPLKn2cPGV8le1ew4QyEmeluv12E/rXDmprBI9apCN3cexdiTqA5D6xqs/tQL2sAnE0ioPjsqC4k8CVTNZVrJjWyri79G7QUs8O8UQrB1kig+GAAY2fPI+Boqgm8qwwRrtlos2hGDyx/XS3eNAAHSOtFdujohB/RdWQTWdWcv9ayKXzl6cRm4XT24aT7+tgsbkoTof2Q319ejA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDFG6SBbX3vr2ehsfULJRcHgBBQonJP+2xl5YWr/LPzqtJ0]
 
 repo::remi_php55: true
 
@@ -112,9 +100,6 @@ php::settings:
 php::dev: true
 php::pear: true
 
-#memcached::max_memory: 256
-#memcached::listen_ip: '127.0.0.1'
-
 infra::profile::nginx_php_fpm_server::upstream:
   'phpfpm':
     ensure: present
@@ -150,9 +135,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
 # Wichtig damit auch die Uploadeinstellungen der php.ini greifen
     client_max_body_size: '32M'
     listen_port: 80
-#    listen_ip: 93.188.107.30
-#    location_allow:
-#    location_deny:
     auth_basic: 'Server'
     auth_basic_user_file: '/etc/nginx/.htpasswd'
     access_log: '/var/log/nginx/tst-berhub-access_log'
@@ -161,7 +143,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
     owner: 'deploy.vogel'
     group: 'nginx'
     mode: '0640'
-#    vhost_cfg_prepend:
     try_files:
       - '$uri'
       - '%uri/'
@@ -199,9 +180,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
     client_max_body_size: '32M'
     listen_port: 443
     ssl_port: 444
-#    listen_ip: 93.188.107.30
-#    location_allow:
-#    location_deny:
     auth_basic: 'Server'
     auth_basic_user_file: '/etc/nginx/.htpasswd'
     access_log: '/var/log/nginx/tst-berhub-access_log'
@@ -210,7 +188,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
     owner: 'deploy.vogel'
     group: 'nginx'
     mode: '0640'
-#    vhost_cfg_prepend:
     try_files:
       - '$uri'
       - '%uri/'
@@ -318,9 +295,7 @@ infra::profile::nginx_php_fpm_server::vhosts:
   tst-wifi-berlin-airport-de:
     www_root: '/srv/www/tst-wifi-berlin-airport-de'
     index_files:
-#      - 'index.php'
       - 'index.html'
-#      - 'index.htm'
     server_name:
       - 'tst-wifi-berlin-airport-de.pixelpark.net'
       - 'tst01-wifi-berlin-airport-de.pixelpark.net'
@@ -331,8 +306,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
       -  '^#/(.*) $1 permanent'
       #BERFBB-3240
       - '^$|^/$ txl/ permanent'
-      #      - '/wp-admin$ $scheme://$host$uri/ permanent'
-      #      - '/files/$ /index.php last'
     location_allow:
       #fbb-wifi-controller
       - '89.27.154.40/29'
@@ -365,17 +338,11 @@ infra::profile::nginx_php_fpm_server::vhosts:
     owner: 'deploy.vogel'
     group: 'nginx'
     mode: '0640'
-#    try_files:
-#      - '$uri'
-#      - '%uri/'
-#      - '/index.php?$args'
     autoindex: 'on'
   tst-wifi-berlin-airport-de_ssl:
     www_root: '/srv/www/tst-wifi-berlin-airport-de'
     index_files:
-#      - 'index.php'
       - 'index.html'
-#      - 'index.htm'
     server_name:
       - 'tst-wifi-berlin-airport-de.pixelpark.net'
       - 'tst01-wifi-berlin-airport-de.pixelpark.net'
@@ -388,8 +355,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
       - '^$|^/$ txl/ permanent'
       #BERFBB-3234
       - '^([^.]*[^/])$ https://tst-wifi-berlin-airport-de.pixelpark.net$1/ permanent'
-#      - '/wp-admin$ $scheme://$host$uri/ permanent'
-#      - '/files/$ /index.php last'
     location_allow:
       #fbb-wifi-controller
       - '89.27.154.40/29'
@@ -419,89 +384,8 @@ infra::profile::nginx_php_fpm_server::vhosts:
     owner: 'deploy.vogel'
     group: 'nginx'
     mode: '0640'
-#    try_files:
-#      - '$uri'
-#      - '%uri/'
-#      - '/index.php?$args'
     autoindex: 'on'
 
-## Siehe: GRIDPARK-4137
-#  tst-ila-berlin-airport-de:
-#    ensure: present
-#    www_root: '/srv/www/tst-ila-berlin-airport-de'
-#     index_files:
-#       - 'index.php'
-#       - 'index.html'
-#       - 'index.htm'
-#     server_name:
-#       - 'tst-ila-berlin-airport-de.pixelpark.net'
-#       - 'tst01-ila-berlin-airport-de.pixelpark.net'
-#       - 'tst02-ila-berlin-airport-de.pixelpark.net'
-#       - 'tst-ila.berlin-airport.de'
-#       - 'tst-ila01.berlin-airport.de'
-#       - 'tst-ila02.berlin-airport.de'
-#     rewrite_rules:
-#       - '^/wp-admin$ $scheme://$host$uri/index.php permanent'
-#       - '/files/$ /index.php last'
-#       - '^/wp-admin/$ $scheme://$host/wp-admin/index.php permanent'
-# # Wichtig damit auch die Uploadeinstellungen der php.ini greifen
-#     client_max_body_size: '32M'
-#     listen_port: 80
-# #    listen_ip: 93.188.107.30
-# #    location_allow:
-# #    location_deny:
-#     auth_basic: 'Server'
-#     auth_basic_user_file: '/etc/nginx/.htpasswd'
-#     access_log: '/var/log/nginx/tst-ila-access_log'
-#     error_log: '/var/log/nginx/tst-ila-error_log'
-#     format_log: 'combined'
-#     owner: 'deploy.vogel'
-#     group: 'nginx'
-#     mode: '0640'
-# #    vhost_cfg_prepend:
-#     try_files:
-#       - '$uri'
-#       - '%uri/'
-#       - '/index.php?$args'
-#     autoindex: 'on'
-#   tst-ila-berlin-airport-de_ssl:
-#     ensure: present
-#     www_root: '/srv/www/tst-ila-berlin-airport-de'
-#     index_files:
-#       - 'index.php'
-#       - 'index.html'
-#       - 'index.htm'
-#     server_name:
-#       - 'tst-ila-berlin-airport-de.pixelpark.net'
-#       - 'tst01-ila-berlin-airport-de.pixelpark.net'
-#       - 'tst02-ila-berlin-airport-de.pixelpark.net'
-#       - 'tst-ila.berlin-airport.de'
-#       - 'tst-ila01.berlin-airport.de'
-#       - 'tst-ila02.berlin-airport.de'
-#     rewrite_rules:
-#       - '^/wp-admin$ $scheme://$host$uri/ permanent'
-#       - '/files/$ /index.php last'
-#       - '^/wp-admin/$ $scheme://$host/wp-admin/index.php permanent'
-# # Wichtig damit auch die Uploadeinstellungen der php.ini greifen
-#     client_max_body_size: '32M'
-#     listen_port: 81
-# #    listen_ip: 93.188.107.30
-# #    location_allow:
-# #    location_deny:
-#     auth_basic: 'Server'
-#     auth_basic_user_file: '/etc/nginx/.htpasswd'
-#     access_log: '/var/log/nginx/tst-ila-access_log'
-#     error_log: '/var/log/nginx/tst-ila-error_log'
-#     format_log: 'combined'
-#     owner: 'deploy.vogel'
-#     group: 'nginx'
-#     mode: '0640'
-# #    vhost_cfg_prepend:
-#     try_files:
-#       - '$uri'
-#       - '%uri/'
-#       - '/index.php?$args'
-#     autoindex: 'on'
 
 infra::profile::nginx_php_fpm_server::location:
   'favicon.ico_berhub':
@@ -831,167 +715,3 @@ infra::profile::nginx_php_fpm_server::location:
       fastcgi_pass: '127.0.0.1:9000'
       fastcgi_index: 'index.php'
       fastcgi_param: 'HTTPS on'
-  ## 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'