fbb-www - create docroot symlink

diff --git a/customer/fbb-www/common.yaml b/customer/fbb-www/common.yaml
index 680a88156d1c4bfbfb280dbb7fccdc914f750ce3..011bd755dbf61cbca77bf372f7ed637402e9e7c3 100644 (file)
--- a/customer/fbb-www/common.yaml
+++ b/customer/fbb-www/common.yaml
@@ -170,4 +170,7 @@ infra::additional_files:
     mode: '0775'
   '/www/data':
     ensure: 'link'
-    target: '/var/data'
\ No newline at end of file
+    target: '/var/data'
+  '/var/www/berlin-airport':
+    ensure: 'link'
+    target: '/var/data/fiona/web/online/docs'
\ No newline at end of file

diff --git a/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml b/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
index 68ec367feea3a5368d1df9cb55e3f935dd04a487..7c60ad443119984b96166b7134903908fe47ce97 100644 (file)
--- a/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
@@ -93,7 +93,7 @@ infra::profile::apache::htdigest:
 
 infra::profile::apache::pp_vhosts:
   berlin-airport:
-    docroot: '/var/www/berlin-airport/web'
+    docroot: '/var/www/berlin-airport'
     servername: dev-www-fbb.pixelpark.net
     ssl: false
     default_vhost: true
@@ -110,7 +110,7 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Frame-Options: DENY'
     directories:
       - provider: 'directory'
-        path: "/var/www/berlin-airport/web"
+        path: '/var/www/berlin-airport'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-berlin-airport.sock|fcgi://./" , extensions: '.php' }
         options:

diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index 743e2bacb72fcd3de9c57ab2677f3bea84f87770..f40f2ff2305fbd68327d9d580e1490f2cc9079ae 100644 (file)
--- a/customer/fbb-www/production.yaml
+++ b/customer/fbb-www/production.yaml
@@ -147,7 +147,7 @@ infra::profile::apache::htdigest:
 
 infra::profile::apache::pp_vhosts:
   berlin-airport:
-    docroot: '/var/www/berlin-airport/web'
+    docroot: '/var/www/berlin-airport'
     servername: prd-www-fbb.pixelpark.net
     serveraliases:
       - prd-www01-fbb.pixelpark.net
@@ -183,7 +183,7 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Frame-Options: DENY'
     directories:
       - provider: 'directory'
-        path: "/var/www/berlin-airport/web"
+        path: '/var/www/berlin-airport'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-berlin-airport.sock|fcgi://./" , extensions: '.php' }
         options:

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index 0a43d6dfa04a006f83964f65d1138a90d722636d..07298d864d408cd44a2402e2606877097c7fa4a9 100644 (file)
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -213,7 +213,7 @@ infra::profile::apache::htdigest:
 
 infra::profile::apache::pp_vhosts:
   berlin-airport:
-    docroot: '/var/www/berlin-airport/web'
+    docroot: '/var/www/berlin-airport'
     servername: tst-www-fbb.pixelpark.net
     serveraliases:
       - tst-www01-fbb.pixelpark.net
@@ -240,7 +240,7 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Frame-Options: DENY'
     directories:
       - provider: 'directory'
-        path: '/var/www/berlin-airport/web'
+        path: '/var/www/berlin-airport'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-berlin-airport.sock|fcgi://./" , extensions: '.php' }
         options: