From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Tue, 4 Jul 2017 07:35:45 +0000 (+0200)
Subject: fbb-www - create docroot symlink
X-Git-Tag: v0.1.0~2736^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4ef3048fbac5b894f1beddac9e81c4b3404c5969;p=pixelpark%2Fhiera.git

fbb-www - create docroot symlink
---

diff --git a/customer/fbb-www/common.yaml b/customer/fbb-www/common.yaml
index 680a8815..011bd755 100644
--- 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 68ec367f..7c60ad44 100644
--- 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 743e2bac..f40f2ff2 100644
--- 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 0a43d6df..07298d86 100644
--- 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: