changed orat docroot

diff --git a/customer/fbb-orat/production.yaml b/customer/fbb-orat/production.yaml
index cdc477e5a67a8f72aee5ba34e75ee97832f3749a..aa8210c578f047caba8764113f49869baa9a8c47 100644 (file)
--- a/customer/fbb-orat/production.yaml
+++ b/customer/fbb-orat/production.yaml
@@ -25,7 +25,7 @@ apache::mod::remoteip::proxy_ips:
 
 site::profile::wordpress::projects:
   orat:
-    docroot: '/var/www/orat'
+    docroot: '/var/www/orat/src'
     servername: www-orat-berlin-airport-de.pixelpark.net
     serveraliases:
       - ber.berlin-airport.de
@@ -43,7 +43,7 @@ site::profile::wordpress::projects:
       - 'set Cache-Control "private, no-cache, no-store, must-revalidate, max-age=0"'
       - 'set Pragma "no-cache"'
       - 'set Expires 0'
-      - "set Content-Security-Policy: \"default-src 'self' www.youtube.com; img-src 'self' *.fbcdn.net secure.gravatar.com *.google-analytics.com *.facebook.com www.google.com www.youtube.com *.doubleclick.net data:; font-src 'self' fonts.gstatic.com data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.addthis.com *.addthisedge.com *.google-analytics.com *.facebook.com www.google.com www.youtube.com *.doubleclick.net; child-src 'self' *.facebook.com; frame-ancestors 'self';\""
+#      - "set Content-Security-Policy: \"default-src 'self' www.youtube.com; img-src 'self' *.fbcdn.net secure.gravatar.com *.google-analytics.com *.facebook.com www.google.com www.youtube.com *.doubleclick.net data:; font-src 'self' fonts.gstatic.com data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.addthis.com *.addthisedge.com *.google-analytics.com *.facebook.com www.google.com www.youtube.com *.doubleclick.net; child-src 'self' *.facebook.com; frame-ancestors 'self';\""
     directories:
       - provider: location
         path: '/wp-admin/'
@@ -90,7 +90,7 @@ site::additional_files:
     group: apache
     mode: '0640'
     ensure: 'file'
-    path: '/var/www/orat/wp-config-local.php'
+    path: '/var/www/orat/src/wp-config-local.php'
     content: |
               <?php
               define('WP_CONTEXT',             '');
@@ -112,7 +112,7 @@ site::additional_files:
               define('DB_PASSWORD',            '%{hiera('db_password')}');
               define('DB_HOST',                'localhost');
 
-              define('DOCUMENT_ROOT', '/var/www/orat');
+              define('DOCUMENT_ROOT', '/var/www/orat/src');
               define('TMP_DIR', '/var/www/tmp/');
               define('LOG_DIR', '/var/log/php/');
 

diff --git a/customer/fbb-orat/test.yaml b/customer/fbb-orat/test.yaml
index 7ff388c889f228858c4edbee30ee3289c6f1c9ec..d902023741734c7e86a377edc20a75b616bcca42 100644 (file)
--- a/customer/fbb-orat/test.yaml
+++ b/customer/fbb-orat/test.yaml
@@ -53,7 +53,7 @@ site::profile::wordpress::projects:
       - 'set Cache-Control "private, no-cache, no-store, must-revalidate, max-age=0"'
       - 'set Pragma "no-cache"'
       - 'set Expires 0'
-      - "set Content-Security-Policy: \"default-src 'self' www.youtube.com; img-src 'self' *.fbcdn.net secure.gravatar.com *.google-analytics.com *.facebook.com www.google.com www.youtube.com *.doubleclick.net data:; font-src 'self' fonts.gstatic.com data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.addthis.com *.addthisedge.com *.google-analytics.com *.facebook.com www.google.com www.youtube.com *.doubleclick.net; child-src 'self' *.facebook.com; frame-ancestors 'self';\""
+#      - "set Content-Security-Policy: \"default-src 'self' www.youtube.com; img-src 'self' *.fbcdn.net secure.gravatar.com *.google-analytics.com *.facebook.com www.google.com www.youtube.com *.doubleclick.net data:; font-src 'self' fonts.gstatic.com data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.addthis.com *.addthisedge.com *.google-analytics.com *.facebook.com www.google.com www.youtube.com *.doubleclick.net; child-src 'self' *.facebook.com; frame-ancestors 'self';\""
     directories:
       - provider: location
         path: '/wp-admin/'