pfizer - cleanup

diff --git a/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml
index be4fc34e6e91f2860d4b80482d267b654834ec20..d458f0ae35f488c924e3ab968bf279f48d176001 100644 (file)
--- a/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml
@@ -1105,9 +1105,6 @@ site::profile::apache::pp_vhosts:
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
-    options:
-      - FollowSymLinks
-      - MultiViews
     ssl: true
     ssl_cert: /etc/pki/tls/certs/www.pfizer.de-cert.pem.san
     ssl_chain: /etc/pki/tls/certs/www.pfizer.de-cert.pem.san
@@ -1122,6 +1119,15 @@ site::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/srv/www/www.lungenkrebs-testen.de'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
   wegweiser-psoriasis:
     servername: www.wegweiser-psoriasis.de
     docroot: '/srv/www/www.wegweiser-rheuma-psoriasis.de/current'
@@ -1136,9 +1142,6 @@ site::profile::apache::pp_vhosts:
     ssl_chain: /etc/pki/tls/certs/www.pfizer.de-cert.pem.san
     ssl_key: /etc/pki/tls/private/www.pfizer.de-key.pem.san
     directoryindex: psoriasis.html
-    options:
-      - FollowSymLinks
-      - MultiViews
     serveraliases:
       - wegweiser-psoriasis.de
       # Upgrade
@@ -1148,6 +1151,15 @@ site::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/srv/www/www.wegweiser-rheuma-psoriasis.de/current'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
     rewrites:
       - www:
         comment: 'Alles nach www'
@@ -1175,9 +1187,6 @@ site::profile::apache::pp_vhosts:
     ssl_chain: /etc/pki/tls/certs/www.pfizer.de-cert.pem.san
     ssl_key: /etc/pki/tls/private/www.pfizer.de-key.pem.san
     directoryindex: rheuma.html
-    options:
-      - FollowSymLinks
-      - MultiViews
     serveraliases:
       - wegweiser-rheuma.de
       # Upgrade
@@ -1187,6 +1196,15 @@ site::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/srv/www/www.wegweiser-rheuma-psoriasis.de/current'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
     rewrites:
       - www:
         comment: 'Alles nach www'
@@ -1209,9 +1227,6 @@ site::profile::apache::pp_vhosts:
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
-    options:
-      - FollowSymLinks
-      - MultiViews
     ssl: true
     ssl_cert: /etc/pki/tls/certs/www.pfizer.de-cert.pem.san
     ssl_chain: /etc/pki/tls/certs/www.pfizer.de-cert.pem.san
@@ -1225,6 +1240,15 @@ site::profile::apache::pp_vhosts:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Frame-Options: DENY'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/srv/www/www.wegweiser-rheuma-psoriasis.de/current'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
     rewrites:
       - www:
         comment: 'Alles nach www'