bmbf - add rewrites + correct docroot

diff --git a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
index 39c78a2da067b7af10a213728a96e85354ba7ddb..7cbff1f676d5a12658dc936358f54320ac68a260 100644 (file)
--- a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
+++ b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
@@ -95,10 +95,20 @@ site::profile::apache::pp_vhosts:
     passenger_app_root: /var/www/wall/
   wissenschaftsjahr:
     servername: test-web02-bmbf.pixelpark.net
+    docroot: /var/www/wissenschaftsjahr
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/wissenschaftsjahr'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - None
+        directoryindex: index.html
       - location1:
         provider: location
         path: '/'
@@ -111,10 +121,16 @@ site::profile::apache::pp_vhosts:
         require:
           - local
     rewrites_non_ssl:
-      - https:
-        comment: 'all to https'
+      - comment: 'all to https'
         rewrite_rule:
           - '^(.*)$ https://test-web02-bmbf.pixelpark.net$1 [L,R=301]'
+      - comment: 'rewrite to 2016-17'
+        rewrite_cond:
+          - '%%{ich-trickse}{REQUEST_URI} !^/piwik/.*'
+          - '%%{ich-trickse}{REQUEST_URI} !^/20\d{2}/'
+          - '%%{ich-trickse}{REQUEST_URI} !^/20\d{2}\-\d{2}/'
+        rewrite_rule:
+          - '^(.*)$ https://%{HTTP_HOST}/2016-17/$1 [R=302]'
     ssl_proxyengine: true
     proxy_pass:
       - { path: /2007/, url: 'https://test-abc-der-menschheit-de.pixelpark.net/' }