From 213eac58edbb4f127e4566762105ff909d390047 Mon Sep 17 00:00:00 2001 From: sambufe Date: Wed, 27 Jun 2018 14:12:49 +0200 Subject: [PATCH] BERFBB-4517 abbau fbb blog prd --- customer/fbb-web/production.yaml | 76 ------------------- ...web02-berlin-airport-de.pixelpark.net.yaml | 12 --- ...web01-berlin-airport-de.pixelpark.net.yaml | 25 ------ ...web02-berlin-airport-de.pixelpark.net.yaml | 37 --------- 4 files changed, 150 deletions(-) diff --git a/customer/fbb-web/production.yaml b/customer/fbb-web/production.yaml index 4efd0835..5923a812 100644 --- a/customer/fbb-web/production.yaml +++ b/customer/fbb-web/production.yaml @@ -42,16 +42,9 @@ accounts::users: mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArKBt0vpxz9bU6KkgLOzJOgycMijRe/b02cKe+3k8HtjTOs7R2FYGBv1IxPCDi/C3m3jukt/+2M89RmK7eBC6Wv9DqKbPMWOhNIDbDqcgUJMhEh5CNGRodArFLHiJWz4on7YCNl+W9noJbFNyctOzGXJCawpTE0XXpX5+jy0/iMx4xhFtBfVrYXbqcZiK/O8/jMnU2tvu9sO3fpZG8uLEVnhL7+gJxtSciqgUP+39ZQySoIlYjsm9ASvsLCiKCdNkktGKM3jNMIE1E8OLS7DFOKCMVgyRr/A6LQ1N3sbbOBLZcG8SdDRUuct9UXY0EqVtrqDDw0lr0zRs0Ew3/UDsmTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA+JSSCdmOK9eNsL1Bz4aAQgBDOYi39RkZrZipluMr1YNQA] infra::profile::mysql_server::databases: - wordpress: - user: wordpress - password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWfDuXpV9jEl6uXIs62wrFLNe05AR+9Ai7lniDf/FXjGMBLYGDc62+YPvDF4f0v2PK7kYPxpz6VOPq8RD44Lkj6I7jED2vMLBB840I5SAZDCdHyhG28m1DbRr5lYXh7F1KRSvBbq1Sf1B5V29PppgUne+aypZ3+vsEMN4KjmpTwMDK9tlKUS3BPlT2b1UWE3UtUdHPFiixU21GATYFLLsEi/J1JLK2ORDMworEO5hlmHOWgNgXz/pwZvQixmlz0LrrK4siaexxVWHPF4jvlzJqMlfguiguYwW63jvnnF8Aed3y85WOskZMpElC+tdWSI/us/Yfh45a9GZ2AwfmG79qzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBtkPB2ijBownRs1oTtNK9bgBA3PUVID7Us5uf9pAagG3Iw] ber-hub: user: ber-hub password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAeN4FuAZLhlLxreWDdjj5QNqZGNvSmvjv9rRmvjYoSYN3IEBBiCkojBhdjuUNVF4L+tYzbqR5c1//NeyNH0V5mjM5D3zUVLQz4zMcX5NhAjWFTGo1DstKi+Z+Fe9e50dIT3j4iGh4yrdr9dMbWjexNuJu/pi/wr9dXpeZJMy4QVSgsmzKtFlEHU5fYagjns1pttGFWH+Bzeun4dZtDbBRurWkMe2B+R008VdAC/+60WMmTzQnErxTj2Buhg9xDtNgPk1VzEO+J8qJXqiCnHKGlXpaiRyENCS6pQuOmduP/tLmx6nV60YDY9Tl654D7TaD5GR+FTqyyL2WuJNpbr4EwjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCfoNSYRNLOSnlPT5dpRGaggBCEIoyHVGGYZd6T0n4Uilek] -##siehe: GRIDPARK-4137 -# ila: -# user: ila -# password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAktESTtCozpIhCRl9Xw35rIBlHTbI0dckgLNv7P4GeEdihVkYs18oeyjlSlk9yScMTX4mf+XFuQWgD554nnDGgR5ktHfi2vCBdIYB0aCx4gkRhpPjIFBhIhw6ZLl5P7hBJ4wfkZ3Bjwp/Q3kwM+BUq6TrwJbD1U78l7cKzxMaHXxZDgDkr9eYDq1rC3umkcLMhUfCeq2wbcL7Ox2m84QO83WmwrBI4gAkGaL79+x98TqBfJgswT0JoGNT6ehN4tkKSfQV7wf09d84NBPzaljEHNR/STuSdRWYQKHhQa2501Ds0diPoDDPRBFYkjhgHhFgnKtsv5tselnwd6zlywCluTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBxyQKlCJv36buaoXKFtL2kgBCsg7ZDMeach0pRpa3joCMP] repo::remi_php55: true @@ -165,75 +158,6 @@ infra::profile::nginx_php_fpm_server::vhosts: - '%uri/' - '/index.php?$args' autoindex: 'on' - blog-berlin-airport-de: - www_root: '/srv/www/blog-berlin-airport-de' - index_files: - - 'index.php' - - 'index.html' - - 'index.htm' - server_name: - - 'blog-berlin-airport-de.pixelpark.net' - - 'www-blog-berlin-airport-de.pixelpark.net' - - 'blog02-berlin-airport-de.pixelpark.net' - - 'blog01-berlin-airport-de.pixelpark.net' - - 'blog.berlin-airport.de' - - 'blog01.berlin-airport.de' - - 'blog02.berlin-airport.de' - rewrite_rules: - - '^.*$ http://www.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' - blog-berlin-airport-de_ssl: - www_root: '/srv/www/blog-berlin-airport-de' - index_files: - - 'index.php' - - 'index.html' - - 'index.htm' - server_name: - - 'blog-berlin-airport-de.pixelpark.net' - - 'www-blog-berlin-airport-de.pixelpark.net' - - 'blog01-berlin-airport-de.pixelpark.net' - - 'blog02-berlin-airport-de.pixelpark.net' - - 'blog.berlin-airport.de' - - 'blog01.berlin-airport.de' - - 'blog02.berlin-airport.de' - rewrite_rules: - - '^.*$ http://www.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' wifi-berlin-airport-de: www_root: '/srv/www/wifi-berlin-airport-de' index_files: 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 ec7a5bdb..944b2d81 100644 --- 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,18 +11,6 @@ mysql::server::override_options: binlog-ignore-db: 'performance_schema, information_schema' expire-logs-days: '7' bind-address: '93.188.107.95' - # 'wp-admin_ila': - # www_root: '/srv/www/tst-ila-berlin-airport-de' - # vhost: tst-ila-berlin-airport-de - # location: '/wp-admin/' - # location_deny: - # - 'all' - # 'wp-admin_ssl_ila': - # www_root: '/srv/www/tst-ila-berlin-airport-de' - # vhost: tst-ila-berlin-airport-de_ssl - # location: '/wp-admin/' - # location_deny: - # - 'all' infra::profile::cron::cronjobs: roadmap-wordpress-update: diff --git a/customer/fbb-web/web01-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-web/web01-berlin-airport-de.pixelpark.net.yaml index e018d847..c99509f2 100644 --- a/customer/fbb-web/web01-berlin-airport-de.pixelpark.net.yaml +++ b/customer/fbb-web/web01-berlin-airport-de.pixelpark.net.yaml @@ -19,32 +19,7 @@ mysql::server::override_options: expire-logs-days: '7' bind-address: '93.188.107.30' -infra::profile::nginx_php_fpm_server::location: - 'wp-admin': - www_root: '/srv/www/blog-berlin-airport-de' - vhost: blog-berlin-airport-de - location: '/wp-admin/' - location_deny: - - 'all' - 'wp-admin_ssl': - www_root: '/srv/www/blog-berlin-airport-de' - vhost: 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/blog-berlin-airport-de/"' - minute: '30' - hour: '11' - date: '*' - month: '*' - weekday: '1-5' - user: nginx - environment: - - 'PATH="/usr/local/bin:/bin"' - - 'HTTP_HOST="blog-berlin-airport-de.pixelpark.net"' roadmap-wordpress-update: command: 'wp core update --path="/srv/www/berhub-berlin-airport-de/"' minute: '0' 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 2533dcd0..ecefad24 100644 --- a/customer/fbb-web/web02-berlin-airport-de.pixelpark.net.yaml +++ b/customer/fbb-web/web02-berlin-airport-de.pixelpark.net.yaml @@ -19,44 +19,7 @@ mysql::server::override_options: expire-logs-days: '7' bind-address: '93.188.107.35' -infra::profile::nginx_php_fpm_server::location: - 'wp-admin': - www_root: '/srv/www/berhub-berlin-airport-de' - vhost: berhub-berlin-airport-de - location: '/wp-admin/' - location_deny: - - 'all' - 'wp-admin_ssl': - www_root: '/srv/www/berhub-berlin-airport-de' - vhost: berhub-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' - infra::profile::cron::cronjobs: - blog-wordpress-update: - command: 'wp core update --path="/srv/www/blog-berlin-airport-de/"' - minute: '0' - hour: '11' - date: '*' - month: '*' - weekday: '1-5' - user: nginx - environment: - - 'PATH="/usr/local/bin:/bin"' - - 'HTTP_HOST="blog-berlin-airport-de.pixelpark.net"' roadmap-wordpress-update: command: 'wp core update --path="/srv/www/berhub-berlin-airport-de/"' minute: '30' -- 2.39.5