]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
BERFBB-4507 kiosk tst
authorsambufe <samuel.bufe@publicispixelpark.de>
Thu, 8 Mar 2018 09:47:31 +0000 (10:47 +0100)
committersambufe <samuel.bufe@publicispixelpark.de>
Thu, 8 Mar 2018 09:47:43 +0000 (10:47 +0100)
customer/fbb-www/production.yaml
customer/fbb-www/test.yaml

index e4358d64f5bdb8b4d0f147401ef809844b1e0f54..bbecdb72233f4d84b90f46a6d82766c92185356f 100644 (file)
@@ -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
index 12ca1534b446ddf2fb4daafda94f56da643b3ecf..875b4a673f78201f203f6caf0bd8998458461b64 100644 (file)
@@ -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