]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
BERFBB-4507 publications vhost
authorsambufe <samuel.bufe@publicispixelpark.de>
Wed, 7 Mar 2018 14:21:34 +0000 (15:21 +0100)
committersambufe <samuel.bufe@publicispixelpark.de>
Wed, 7 Mar 2018 14:21:52 +0000 (15:21 +0100)
customer/fbb-www/production.yaml

index 108450af5f8d7cf3044ae250365b733c2227ca09..f847cb3fa5a530d85e1b913ede25a7941bf74988 100644 (file)
@@ -671,6 +671,28 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
         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
@@ -683,7 +705,6 @@ infra::profile::apache::pp_vhosts:
       - prd-www02-fbb.pixelpark.net
       - www01-berlin-airport-de.pixelpark.net
       - www02-berlin-airport-de.pixelpark.net
-      - publications.berlin-airport.de
     ssl: false
     docroot_owner: apache
     docroot_group: apache
@@ -906,12 +927,6 @@ infra::profile::apache::pp_vhosts:
           - '%{literal("%")}{REQUEST_URI} ^/ADSL-Info/infotext.html$'
         rewrite_rule:
           - '^/.*$ /de/global/ADSL-info/index.php [L,R=301]'
-      - comment: 'BERFBB-4507'
-        rewrite_cond:
-          - '%{literal("%")}{HTTP:Https} on'
-          - '%{literal("%")}{HTTP_HOST} ^publications.berlin-airport.de$'
-        rewrite_rule:
-          - '^.*$ https://www.yumpu.com/kiosk/berlinairport [P]'
       - comment: 'Redirect berlin-airport.de auf www.berlin-airport.de'
         rewrite_cond:
           - '%{literal("%")}{HTTP_HOST} ^berlin-airport.de$'