From 9bee57a9c4d3f93c52d5198566622ded9524d3a4 Mon Sep 17 00:00:00 2001 From: sambufe Date: Thu, 8 Mar 2018 10:47:31 +0100 Subject: [PATCH] BERFBB-4507 kiosk tst --- customer/fbb-www/production.yaml | 21 --------------------- customer/fbb-www/test.yaml | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml index e4358d64..bbecdb72 100644 --- a/customer/fbb-www/production.yaml +++ b/customer/fbb-www/production.yaml @@ -672,27 +672,6 @@ infra::profile::apache::pp_vhosts: allow_override: - None - # publications-berlin-airport: - # docroot: '/var/www/publications-berlin-airport' - # servername: publications.berlin-airport.de - # ssl: false - # docroot_owner: apache - # docroot_group: apache - # access_log_format: remote_combined - # setenvif: - # - 'HTTPS on X-Forwarded-Proto=https' - # - 'HTTPS on HTTPS=on' - # headers: - # - 'set X-Content-Type-Options: nosniff' - # - 'set X-XSS-Protection: "1; mode=block"' - # - 'set X-Frame-Options: DENY' - # directories: - # - provider: 'directory' - # path: '/var/www/publications-berlin-airport' - # allow_override: - # - None - # custom_fragment: 'ProxyPassMatch ^.*$ https://www.yumpu.com/kiosk/berlinairport' - berlin-airport: docroot: '/var/www/berlin-airport' servername: prd-www-fbb.pixelpark.net diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml index 12ca1534..875b4a67 100644 --- a/customer/fbb-www/test.yaml +++ b/customer/fbb-www/test.yaml @@ -457,6 +457,26 @@ infra::profile::apache::pp_vhosts: require: # lb-healthcheck---------------|fbb nat-------|parksystem BERFBB-3392---------------------|flughafen----------------------|local----------|PPAdmin-NAT-|-UnitB----------|Apcoa BERFBB-4095---| - 'ip 192.168.66.251 192.168.66.252 172.17.85.0/24 81.145.60.194 212.46.144.129 80.154.135.222 194.174.73.0/24 194.174.78.0/24 192.168.66.0/24 10.99.1.0/24 192.168.134.0/24 212.46.144.238' + publications-berlin-airport: + docroot: '/var/www/publications-berlin-airport' + servername: publications.berlin-airport.de + ssl: false + docroot_owner: apache + docroot_group: apache + access_log_format: remote_combined + setenvif: + - 'HTTPS on X-Forwarded-Proto=https' + - 'HTTPS on HTTPS=on' + headers: + - 'set X-Content-Type-Options: nosniff' + - 'set X-XSS-Protection: "1; mode=block"' + - 'set X-Frame-Options: DENY' + directories: + - provider: 'directory' + path: '/var/www/publications-berlin-airport' + allow_override: + - None + custom_fragment: 'ProxyPassMatch ^.*$ https://www.yumpu.com/kiosk/berlinairport' berlin-airport: docroot: '/var/www/berlin-airport' servername: tst-www-fbb.pixelpark.net -- 2.39.5