From: sambufe Date: Thu, 14 Sep 2017 13:54:35 +0000 (+0200) Subject: GRIDPARK-4137 on prd X-Git-Tag: v0.1.0~2437^2~5^2~26 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f37f18f41ed5bc65051bf760345c10a12a636d48;p=pixelpark%2Fhiera.git GRIDPARK-4137 on prd --- diff --git a/customer/fbb-web/production.yaml b/customer/fbb-web/production.yaml index 48606639..8f6b4907 100644 --- a/customer/fbb-web/production.yaml +++ b/customer/fbb-web/production.yaml @@ -42,9 +42,11 @@ infra::profile::mysql_server::databases: ber-hub: user: ber-hub password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeN4FuAZLhlLxreWDdjj5QNqZGNvSmvjv9rRmvjYoSYN3IEBBiCkojBhdjuUNVF4L+tYzbqR5c1//NeyNH0V5mjM5D3zUVLQz4zMcX5NhAjWFTGo1DstKi+Z+Fe9e50dIT3j4iGh4yrdr9dMbWjexNuJu/pi/wr9dXpeZJMy4QVSgsmzKtFlEHU5fYagjns1pttGFWH+Bzeun4dZtDbBRurWkMe2B+R008VdAC/+60WMmTzQnErxTj2Buhg9xDtNgPk1VzEO+J8qJXqiCnHKGlXpaiRyENCS6pQuOmduP/tLmx6nV60YDY9Tl654D7TaD5GR+FTqyyL2WuJNpbr4EwjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCfoNSYRNLOSnlPT5dpRGaggBCEIoyHVGGYZd6T0n4Uilek] - ila: - user: ila - password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAktESTtCozpIhCRl9Xw35rIBlHTbI0dckgLNv7P4GeEdihVkYs18oeyjlSlk9yScMTX4mf+XFuQWgD554nnDGgR5ktHfi2vCBdIYB0aCx4gkRhpPjIFBhIhw6ZLl5P7hBJ4wfkZ3Bjwp/Q3kwM+BUq6TrwJbD1U78l7cKzxMaHXxZDgDkr9eYDq1rC3umkcLMhUfCeq2wbcL7Ox2m84QO83WmwrBI4gAkGaL79+x98TqBfJgswT0JoGNT6ehN4tkKSfQV7wf09d84NBPzaljEHNR/STuSdRWYQKHhQa2501Ds0diPoDDPRBFYkjhgHhFgnKtsv5tselnwd6zlywCluTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBxyQKlCJv36buaoXKFtL2kgBCsg7ZDMeach0pRpa3joCMP] +##siehe: GRIDPARK-4137 +# ila: +# user: ila +# password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAktESTtCozpIhCRl9Xw35rIBlHTbI0dckgLNv7P4GeEdihVkYs18oeyjlSlk9yScMTX4mf+XFuQWgD554nnDGgR5ktHfi2vCBdIYB0aCx4gkRhpPjIFBhIhw6ZLl5P7hBJ4wfkZ3Bjwp/Q3kwM+BUq6TrwJbD1U78l7cKzxMaHXxZDgDkr9eYDq1rC3umkcLMhUfCeq2wbcL7Ox2m84QO83WmwrBI4gAkGaL79+x98TqBfJgswT0JoGNT6ehN4tkKSfQV7wf09d84NBPzaljEHNR/STuSdRWYQKHhQa2501Ds0diPoDDPRBFYkjhgHhFgnKtsv5tselnwd6zlywCluTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBxyQKlCJv36buaoXKFtL2kgBCsg7ZDMeach0pRpa3joCMP] + repo::remi_php55: true @@ -295,71 +297,73 @@ infra::profile::nginx_php_fpm_server::vhosts: # - '%uri/' # - '/index.php?$args' autoindex: 'on' - ila-berlin-airport-de: - www_root: '/srv/www/ila-berlin-airport-de' - index_files: - - 'index.php' - - 'index.html' - - 'index.htm' - server_name: - - 'www-ila-berlin-airport-de.pixelpark.net' - - 'ila02-berlin-airport-de.pixelpark.net' - - 'ila01-berlin-airport-de.pixelpark.net' - - 'ila.berlin-airport.de' - - 'ila01.berlin-airport.de' - - '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' - client_max_body_size: '32M' - listen_port: 80 -# auth_basic: 'Server' -# auth_basic_user_file: '/etc/nginx/.htpasswd' - access_log: '/var/log/nginx/ila-access_log' - error_log: '/var/log/nginx/ila-error_log' - format_log: 'combined' - owner: 'deploy.vogel' - group: 'nginx' - mode: '0640' - try_files: - - '$uri' - - '%uri/' - - '/index.php?$args' - autoindex: 'on' - ila-berlin-airport-de_ssl: - www_root: '/srv/www/ila-berlin-airport-de' - index_files: - - 'index.php' - - 'index.html' - - 'index.htm' - server_name: - - 'www-ila-berlin-airport-de.pixelpark.net' - - 'ila01-berlin-airport-de.pixelpark.net' - - 'ila02-berlin-airport-de.pixelpark.net' - - 'ila.berlin-airport.de' - - 'ila01.berlin-airport.de' - - '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' - client_max_body_size: '32M' - listen_port: 443 - ssl_port: 444 -# auth_basic: 'Server' -# auth_basic_user_file: '/etc/nginx/.htpasswd' - access_log: '/var/log/nginx/ila-access_log' - error_log: '/var/log/nginx/ila-error_log' - format_log: 'combined' - owner: 'deploy.vogel' - group: 'nginx' - mode: '0640' - try_files: - - '$uri' - - '%uri/' - - '/index.php?$args' - autoindex: 'on' + +##siehe: GRIDPARK-4137 +# ila-berlin-airport-de: +# www_root: '/srv/www/ila-berlin-airport-de' +# index_files: +# - 'index.php' +# - 'index.html' +# - 'index.htm' +# server_name: +# - 'www-ila-berlin-airport-de.pixelpark.net' +# - 'ila02-berlin-airport-de.pixelpark.net' +# - 'ila01-berlin-airport-de.pixelpark.net' +# - 'ila.berlin-airport.de' +# - 'ila01.berlin-airport.de' +# - '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' +# client_max_body_size: '32M' +# listen_port: 80 +# # auth_basic: 'Server' +# # auth_basic_user_file: '/etc/nginx/.htpasswd' +# access_log: '/var/log/nginx/ila-access_log' +# error_log: '/var/log/nginx/ila-error_log' +# format_log: 'combined' +# owner: 'deploy.vogel' +# group: 'nginx' +# mode: '0640' +# try_files: +# - '$uri' +# - '%uri/' +# - '/index.php?$args' +# autoindex: 'on' +# ila-berlin-airport-de_ssl: +# www_root: '/srv/www/ila-berlin-airport-de' +# index_files: +# - 'index.php' +# - 'index.html' +# - 'index.htm' +# server_name: +# - 'www-ila-berlin-airport-de.pixelpark.net' +# - 'ila01-berlin-airport-de.pixelpark.net' +# - 'ila02-berlin-airport-de.pixelpark.net' +# - 'ila.berlin-airport.de' +# - 'ila01.berlin-airport.de' +# - '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' +# client_max_body_size: '32M' +# listen_port: 443 +# ssl_port: 444 +# # auth_basic: 'Server' +# # auth_basic_user_file: '/etc/nginx/.htpasswd' +# access_log: '/var/log/nginx/ila-access_log' +# error_log: '/var/log/nginx/ila-error_log' +# format_log: 'combined' +# owner: 'deploy.vogel' +# group: 'nginx' +# mode: '0640' +# try_files: +# - '$uri' +# - '%uri/' +# - '/index.php?$args' +# autoindex: 'on' infra::profile::nginx_php_fpm_server::location: 'favicon.ico_berhub': @@ -688,166 +692,167 @@ infra::profile::nginx_php_fpm_server::location: fastcgi_buffers: '4 128k' fastcgi_pass: '127.0.0.1:9000' fastcgi_index: 'index.php' - 'favicon.ico_ila': - www_root: '/srv/www/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: ila-berlin-airport-de - location: '~ "\*$"' - ensure: present - index_files: - - 'index.php' - try_files: - - '$uri =404' - 'php-files_ila': - www_root: '/srv/www/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' - vhost: ila-berlin-airport-de_ssl - location: '~ "\*$"' - ensure: present - index_files: - - 'index.php' - try_files: - - '$uri =404' - 'php-files_ila_ssl': - www_root: '/srv/www/ila-berlin-airport-de' - vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: ila-berlin-airport-de + # location: '~ "\*$"' + # ensure: present + # index_files: + # - 'index.php' + # try_files: + # - '$uri =404' + # 'php-files_ila': + # www_root: '/srv/www/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: 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/ila-berlin-airport-de' + # vhost: ila-berlin-airport-de_ssl + # location: '~ "\*$"' + # ensure: present + # index_files: + # - 'index.php' + # try_files: + # - '$uri =404' + # 'php-files_ila_ssl': + # www_root: '/srv/www/ila-berlin-airport-de' + # vhost: 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' diff --git a/customer/fbb-web/web02-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-web/web02-berlin-airport-de.pixelpark.net.yaml index c5475df2..f62d1d4a 100644 --- a/customer/fbb-web/web02-berlin-airport-de.pixelpark.net.yaml +++ b/customer/fbb-web/web02-berlin-airport-de.pixelpark.net.yaml @@ -32,15 +32,15 @@ infra::profile::nginx_php_fpm_server::location: location: '/wp-admin/' location_deny: - 'all' - 'wp-admin': - www_root: '/srv/www/ila-berlin-airport-de' - vhost: ila-berlin-airport-de - location: '/wp-admin/' - location_deny: - - 'all' - 'wp-admin_ssl': - www_root: '/srv/www/ila-berlin-airport-de' - vhost: ila-berlin-airport-de_ssl - location: '/wp-admin/' - location_deny: - - 'all' + # 'wp-admin': + # www_root: '/srv/www/ila-berlin-airport-de' + # vhost: ila-berlin-airport-de + # location: '/wp-admin/' + # location_deny: + # - 'all' + # 'wp-admin_ssl': + # www_root: '/srv/www/ila-berlin-airport-de' + # vhost: ila-berlin-airport-de_ssl + # location: '/wp-admin/' + # location_deny: + # - 'all'