BERFBB-4517 blog deleted from test

diff --git a/customer/fbb-web/test-web01-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-web/test-web01-berlin-airport-de.pixelpark.net.yaml
index 41b7cd09e3688ad651b9bac125d7df2856d96efa..b66f0ed82b6a514c3332bd9b5de6f60b0cf60058 100644 (file)
--- a/customer/fbb-web/test-web01-berlin-airport-de.pixelpark.net.yaml
+++ b/customer/fbb-web/test-web01-berlin-airport-de.pixelpark.net.yaml
@@ -12,32 +12,7 @@ mysql::server::override_options:
     expire-logs-days: '7'
     bind-address: '93.188.107.91'
 
-infra::profile::nginx_php_fpm_server::location:
-  'wp-admin':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-berlin-airport-de
-    location: '/wp-admin/'
-    location_deny:
-      - 'all'
-  'wp-admin_ssl':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-berlin-airport-de_ssl
-    location: '/wp-admin/'
-    location_deny:
-      - 'all'
-
 infra::profile::cron::cronjobs:
-  blog-wordpress-update:
-    command: 'wp core update --path="/srv/www/tst-blog-berlin-airport-de/"'
-    minute: '30'
-    hour: '10'
-    date: '*'
-    month: '*'
-    weekday: '1-5'
-    user: nginx
-    environment:
-      - 'PATH="/usr/local/bin:/bin"'
-      - 'HTTP_HOST="tst-blog-berlin-airport-de.pixelpark.net"'
   roadmap-wordpress-update:
     command: 'wp core update --path="/srv/www/tst-berhub-berlin-airport-de/"'
     minute: '0'

diff --git a/customer/fbb-web/test-web02-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-web/test-web02-berlin-airport-de.pixelpark.net.yaml
index b8b9d67a9bc7ae15fd8290a3d61197e50ed4b65e..ec7a5bdb2a274d2e67f9a3ec4367a935df5f713e 100644 (file)
--- a/customer/fbb-web/test-web02-berlin-airport-de.pixelpark.net.yaml
+++ b/customer/fbb-web/test-web02-berlin-airport-de.pixelpark.net.yaml
@@ -11,20 +11,6 @@ mysql::server::override_options:
     binlog-ignore-db: 'performance_schema, information_schema'
     expire-logs-days: '7'
     bind-address: '93.188.107.95'
-
-infra::profile::nginx_php_fpm_server::location:
-  'wp-admin':
-    www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de
-    location: '/wp-admin/'
-    location_deny:
-      - 'all'
-  'wp-admin_ssl':
-    www_root: '/srv/www/tst-berhub-berlin-airport-de'
-    vhost: tst-berhub-berlin-airport-de_ssl
-    location: '/wp-admin/'
-    location_deny:
-      - 'all'
   # 'wp-admin_ila':
   #   www_root: '/srv/www/tst-ila-berlin-airport-de'
   #   vhost: tst-ila-berlin-airport-de
@@ -39,17 +25,6 @@ infra::profile::nginx_php_fpm_server::location:
   #     - 'all'
 
 infra::profile::cron::cronjobs:
-  blog-wordpress-update:
-    command: 'wp core update --path="/srv/www/tst-blog-berlin-airport-de/"'
-    minute: '0'
-    hour: '10'
-    date: '*'
-    month: '*'
-    weekday: '1-5'
-    user: nginx
-    environment:
-      - 'PATH="/usr/local/bin:/bin"'
-      - 'HTTP_HOST="tst-blog-berlin-airport-de.pixelpark.net"'
   roadmap-wordpress-update:
     command: 'wp core update --path="/srv/www/tst-berhub-berlin-airport-de/"'
     minute: '30'

diff --git a/customer/fbb-web/test.yaml b/customer/fbb-web/test.yaml
index 64e4300e812b3be721bdcaccf327eea4521669ac..9afe8545d0f8b10d175da730931b3e0989b1d059 100644 (file)
--- a/customer/fbb-web/test.yaml
+++ b/customer/fbb-web/test.yaml
@@ -208,95 +208,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
         - '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:
-      - 'index.php'
-      - 'index.html'
-      - 'index.htm'
-    server_name:
-      - 'tst-blog-berlin-airport-de.pixelpark.net'
-      - 'tst-www-blog-berlin-airport-de.pixelpark.net'
-      - 'tst01-blog-berlin-airport-de.pixelpark.net'
-      - 'tst02-blog-berlin-airport-de.pixelpark.net'
-      - 'tstblog.berlin-airport.de'
-      - 'tstblog01.berlin-airport.de'
-      - 'tstblog02.berlin-airport.de'
-    rewrite_rules:
-      - '^.*$ http://tst.berlin-airport.de/ permanent'
-      - '^/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/blog-access_log'
-    error_log: '/var/log/nginx/blog-error_log'
-    format_log: 'combined'
-    owner: 'deploy.vogel'
-    group: 'nginx'
-    mode: '0640'
-    try_files:
-      - '$uri'
-      - '%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:
-      - 'index.php'
-      - 'index.html'
-      - 'index.htm'
-    server_name:
-      - 'tst-blog-berlin-airport-de.pixelpark.net'
-      - 'tst-www-blog-berlin-airport-de.pixelpark.net'
-      - 'tst01-blog-berlin-airport-de.pixelpark.net'
-      - 'tst02-blog-berlin-airport-de.pixelpark.net'
-      - 'tstblog.berlin-airport.de'
-      - 'tstblog01.berlin-airport.de'
-      - 'tstblog02.berlin-airport.de'
-    rewrite_rules:
-      - '^.*$ http://tst.berlin-airport.de/ permanent'
-      - '^/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/blog-access_log'
-    error_log: '/var/log/nginx/blog-error_log'
-    format_log: 'combined'
-    owner: 'deploy.vogel'
-    group: 'nginx'
-    mode: '0640'
-    try_files:
-      - '$uri'
-      - '%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:
@@ -556,167 +467,3 @@ infra::profile::nginx_php_fpm_server::location:
       fastcgi_buffers: '4 128k'
       fastcgi_pass: '127.0.0.1:9000'
       fastcgi_index: 'index.php'
-  'favicon.ico_blog':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-berlin-airport-de
-    location: '/favicon.ico'
-    ensure: present
-    index_files:
-      - 'index.php'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-  'robots.txt_blog':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-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_blog':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-berlin-airport-de
-    ensure: present
-    index_files:
-      - 'index.php'
-    location: '~ /\.'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-      deny: 'all'
-  'images_blog':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-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_blog':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-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_blog':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-berlin-airport-de
-    location: '~ "\*$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    try_files:
-      - '$uri =404'
-  'php-files_blog':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-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_blog_ssl':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-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_blog_ssl':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-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_blog_ssl':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-berlin-airport-de_ssl
-    ensure: present
-    index_files:
-      - 'index.php'
-    location: '~ /\.'
-    location_custom_cfg:
-      access_log: 'off'
-      log_not_found: 'off'
-      deny: 'all'
-  'images_blog_ssl':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-berlin-airport-de_ssl
-    location: '~* "^.+\.(jpg|jpeg|gif|png|ico|)$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    try_files:
-      - '$uri'
-      - '%uri/'
-      - '/index.php'
-  'files_blog_ssl':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-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_blog_ssl':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-berlin-airport-de_ssl
-    location: '~ "\*$"'
-    ensure: present
-    index_files:
-      - 'index.php'
-    try_files:
-      - '$uri =404'
-  'php-files_blog_ssl':
-    www_root: '/srv/www/tst-blog-berlin-airport-de'
-    vhost: tst-blog-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'
-      fastcgi_param: 'HTTPS on'