fbb-www - create cdm website

diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index 42eee03976c3660f2f748792b8918e6feb292d8b..111681a7ce82fcdaa3a6edde7f726480e2085a29 100644 (file)
--- a/customer/fbb-www/production.yaml
+++ b/customer/fbb-www/production.yaml
@@ -112,7 +112,6 @@ sudo::configs:
       florian.dorrer ALL=(unitb.cron) NOPASSWD: ALL
       felix.maier ALL=(unitb.cron) NOPASSWD: ALL
 
-
 infra::profile::cron::cronjobs:
   flugplan-import:
     command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/poll.sh >> /var/log/unitb/flugplan-import.log 2>> /var/log/unitb/flugplan-import.log'
@@ -177,6 +176,9 @@ infra::profile::apache_php::fpm_pool:
   berlin-airport:
     listen_owner: apache
     listen_group: apache
+  cdm-berlin-airport:
+    listen_owner: apache
+    listern_group: apache
 
 php::extensions:
   gd: {}
@@ -187,7 +189,7 @@ php::extensions:
 
 #FBBUBPP-11 und FBBKERNSERV-195
 php::settings:
-#  PHP/serialize_precision: 100       ;war unter PHP 5.3 Standart ist jetzt bei 17
+#  PHP/serialize_precision: 100 war unter PHP 5.3 Standart ist jetzt bei 17
   PHP/memory_limit: 320M
   PHP/post_max_size: 20M
   PHP/register_globals: 'Off'
@@ -248,6 +250,13 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: '/var/www/information-berlin-airport'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
   download-berlin-airport:
     docroot: '/var/www/download-berlin-airport'
     servername: download.berlin-airport.de
@@ -269,6 +278,13 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: '/var/www/download-berlin-airport'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
   media-berlin-airport:
     docroot: '/var/www/media-berlin-airport'
     servername: media.berlin-airport.de
@@ -285,6 +301,13 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: '/var/www/media-berlin-airport'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
   domain-catcher:
     ssl: false
     default_vhost: true
@@ -573,6 +596,15 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: '/var/www/berlin-airport'
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-cdm-berlin-airport.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
   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 60483cfbe9c602e0c78004baf28a7549a7a4bfdc..ecb14d895d8fd6b71d9002fc215a0f71953fa666 100644 (file)
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -203,6 +203,9 @@ infra::profile::apache_php::fpm_pool:
   berlin-airport:
     listen_owner: apache
     listen_group: apache
+  cdm-berlin-airport:
+    listen_owner: apache
+    listern_group: apache
 
 php::extensions:
   gd: {}
@@ -273,6 +276,13 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: '/var/www/information-berlin-airport'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
   download-berlin-airport:
     docroot: '/var/www/download-berlin-airport'
     servername: tstdownload.berlin-airport.de
@@ -294,6 +304,13 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: '/var/www/download-berlin-airport'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
   media-berlin-airport:
     docroot: '/var/www/media-berlin-airport'
     servername: tstmedia.berlin-airport.de
@@ -303,6 +320,20 @@ infra::profile::apache::pp_vhosts:
     ssl: false
     docroot_owner: presse.upload
     docroot_group: fbb
+    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/media-berlin-airport'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
   cdm-berlin-airport:
     docroot: '/var/www/cdm-berlin-airport'
     servername: tstcdm.berlin-airport.de
@@ -321,6 +352,15 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: '/var/www/berlin-airport'
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-cdm-berlin-airport.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
   berlin-airport:
     docroot: '/var/www/berlin-airport'
     servername: tst-www-fbb.pixelpark.net