From 5aef568ccef66892d9f1c3caf0f52b78983f31d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20B=C3=B6ttcher?= Date: Wed, 20 Sep 2017 10:50:53 +0200 Subject: [PATCH] MHK - rename mhk stage --- ...stage-red-mhk-kueche-de.pixelpark.net.yaml | 67 ++++++------------- ...age-www01-mhk-kueche-de.pixelpark.net.yaml | 5 +- ...age-www02-mhk-kueche-de.pixelpark.net.yaml | 7 +- ...age-www03-mhk-kueche-de.pixelpark.net.yaml | 5 +- 4 files changed, 32 insertions(+), 52 deletions(-) diff --git a/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml index 45e0987a..38bda7b0 100644 --- a/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml +++ b/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml @@ -4,7 +4,6 @@ infra::additional_classes: - infra::profile::mysql_server - infra::profile::apache - apache::mod::proxy_ajp - - infra::profile::mongodb_server - mongodb::globals mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPvRUxF6+6iEFM+OWQgHsioCG+vTdm3vWsj4PSnpn6FdlgZCazMIv8uVpWUy0m9B4dE87hNUDANcbkVNDmfWHKVkhqbLGfewbQvx20pkUeyMi27GgpQbLAeIFKpeCn3+E5/X2caJFV/inR5PgkieTtbSkxPFklCP5AnVxFlisidHVl+22pTAqZAIdNgw9qCnOFTyGcT1X0eOBDho24gMxm8bkT1INxvNMCHisQch98OxE2SqdnY3KrWKmSYgKeoCgxaQ/U+0SDF0h7+6y1RGU0r26bWXLpdOlQbOE/fHlW5Z6SPVUkyXAj6+KM4akosUjN8Zwwnp8MG9/GslGbKn4lTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAYY//abLHvPVmXVG7WsjHngCCNVoimvVhTjlXYiUYmoOW5SR1htjGBiWRd+Y2389uMNw==] @@ -33,14 +32,6 @@ mysql::server::override_options: performance_schema: ON -#### Just Doin' no auth at the moment -mongodb::globals::manage_package_repo: true -mongodb::globals::version: 3.0.6-1.el7 -mongodb::globals::bind_ip: 0.0.0.0 -mongodb::globals::repo_location: 'https://repo.pixelpark.com/Linux/yum/mongodb/7/RPMS/' -mongodb::server::auth: false -apache::default_vhost: false - apache::mod::deflate::types: - 'text/css' - 'application/x-javascript application/javascript application/ecmascript' @@ -50,39 +41,39 @@ apache::mod::deflate::types: infra::profile::apache::pp_vhosts: red: docroot: '/var/www' - servername: stage-red-mhk-kueche-de.pixelpark.net + servername: stage-red.kueche.de ssl: true ip: 77.74.235.36 add_listen: true - cert_servername: 'wildcard.pixelpark.net' - cert_customer: 'pixelpark' - ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' - ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + cert_servername: 'wildcard.kueche.de' + cert_customer: 'mhk' + ssl_cert: '/etc/pki/tls/certs/wildcard.kueche.de-cert.pem' + ssl_key: '/etc/pki/tls/private/wildcard.kueche.de-key.pem' + ssl_chain: '/etc/pki/tls/certs/wildcard.kueche.de-cert.pem' rewrites_non_ssl: - https: comment: 'all to https' rewrite_rule: - - '^(.*)$ https://stage-red-mhk-kueche-de.pixelpark.net$1 [L,R=301]' + - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [L,R=301]' proxy_preserve_host: true proxy_pass: - { path: /editor-webstart, url: 'ajp://localhost:40009/editor-webstart' } studio-red: docroot: '/var/www' - servername: stage-studio-red-mhk-kueche-de.pixelpark.net + servername: stage-studio.kueche.de ssl: true ip: 77.74.235.36 add_listen: false - cert_servername: 'wildcard.pixelpark.net' - cert_customer: 'pixelpark' - ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' - ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + cert_servername: 'wildcard.kueche.de' + cert_customer: 'mhk' + ssl_cert: '/etc/pki/tls/certs/wildcard.kueche.de-cert.pem' + ssl_key: '/etc/pki/tls/private/wildcard.kueche.de-key.pem' + ssl_chain: '/etc/pki/tls/certs/wildcard.kueche.de-cert.pem' rewrites_non_ssl: - https: comment: 'all to https' rewrite_rule: - - '^(.*)$ https://stage-studio-red-mhk-kueche-de.pixelpark.net$1 [L,R=301]' + - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [L,R=301]' proxy_preserve_host: true proxy_pass: - { path: /studio, url: 'ajp://localhost:40009/studio' } @@ -91,23 +82,23 @@ infra::profile::apache::pp_vhosts: - studio: comment: "redir slash to studio" rewrite_rule: - - '^(/)?$ https://stage-studio-red-mhk-kueche-de.pixelpark.net/studio/ [R=301,L]' + - '^(/)?$ https://%%{ich-trickse}{SERVER_NAME}/studio/ [R=301,L]' preview-red: docroot: '/var/www' - servername: stage-preview-red-mhk-kueche-de.pixelpark.net + servername: stage-preview.kueche.de ssl: true ip: 77.74.235.44 add_listen: true - cert_servername: 'wildcard.pixelpark.net' - cert_customer: 'pixelpark' - ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' - ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + cert_servername: 'wildcard.kueche.de' + cert_customer: 'mhk' + ssl_cert: '/etc/pki/tls/certs/wildcard.kueche.de-cert.pem' + ssl_key: '/etc/pki/tls/private/wildcard.kueche.de-key.pem' + ssl_chain: '/etc/pki/tls/certs/wildcard.kueche.de-cert.pem' rewrites_non_ssl: - https: comment: 'all to https' rewrite_rule: - - '^(.*)$ https://stage-preview-red-mhk-kueche-de.pixelpark.net$1 [L,R=301]' + - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [L,R=301]' rewrites: - index: comment: 'Coremedia Rewrites' @@ -140,20 +131,6 @@ infra::profile::apache::pp_vhosts: proxy_preserve_host: true proxy_pass: - { path: /blueprint, url: 'ajp://localhost:40009/blueprint' } - media-preview-red: - docroot: '/var/www' - servername: stage-preview-media-red-mhk-kueche-de.pixelpark.net - ssl: true - ip: 77.74.235.36 - add_listen: false - cert_servername: 'wildcard.pixelpark.net' - cert_customer: 'pixelpark' - ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' - ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - proxy_preserve_host: true - proxy_pass: - - { path: /blueprint, url: 'ajp://localhost:40009/blueprint' } logstash::generic_resource: preview: diff --git a/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml index 72ba45e2..4979d047 100644 --- a/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml +++ b/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml @@ -11,15 +11,16 @@ apache::mpm_module: event infra::profile::apache::pp_vhosts: www: docroot: '/var/www/mhk' - servername: stage-www-kueche-de.pixelpark.net + servername: stage-www.kueche.de serveraliases: + - stage-www-kueche-de.pixelpark.net - stage-www01-mhk-kueche-de.pixelpark.net ssl: false rewrites: - to_ssl: comment: 'all to https' rewrite_cond: - - '%%{ich-trickse}{HTTP_HOST} ^stage-www-kueche-de.pixelpark.net$ [NC]' + - '%%{ich-trickse}{HTTP_HOST} ^stage-www\.kueche\.de$ [NC]' - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]' rewrite_rule: - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]' diff --git a/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml index 7cf2f493..9bf54c76 100644 --- a/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml +++ b/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml @@ -11,15 +11,16 @@ apache::mpm_module: event infra::profile::apache::pp_vhosts: www: docroot: '/var/www/mhk' - servername: stage-www-kueche-de.pixelpark.net + servername: stage-www.kueche.de serveraliases: + - stage-www-kueche-de.pixelpark.net - stage-www02-mhk-kueche-de.pixelpark.net ssl: false rewrites: - to_ssl: comment: 'all to https' rewrite_cond: - - '%%{ich-trickse}{HTTP_HOST} ^stage-www-kueche-de.pixelpark.net$ [NC]' + - '%%{ich-trickse}{HTTP_HOST} ^stage-www\.kueche\.de$ [NC]' - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]' rewrite_rule: - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]' @@ -114,7 +115,7 @@ infra::profile::apache::pp_vhosts: #SSLProxyVerify none #SSLProxyCheckPeerCN off #SSLProxyCheckPeerName off - + logstash::generic_resource: webapp: resource: file diff --git a/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml index ec2573b8..34902f11 100644 --- a/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml +++ b/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml @@ -11,15 +11,16 @@ apache::mpm_module: event infra::profile::apache::pp_vhosts: www: docroot: '/var/www/mhk' - servername: stage-www-kueche-de.pixelpark.net + servername: stage-www.kueche.de serveraliases: + - stage-www-kueche-de.pixelpark.net - stage-www03-mhk-kueche-de.pixelpark.net ssl: false rewrites: - to_ssl: comment: 'all to https' rewrite_cond: - - '%%{ich-trickse}{HTTP_HOST} ^stage-www-kueche-de.pixelpark.net$ [NC]' + - '%%{ich-trickse}{HTTP_HOST} ^stage-www\.kueche\.de$ [NC]' - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]' rewrite_rule: - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]' -- 2.39.5