bmbf - Add new vhost

diff --git a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
index 255ecf0b64bb31bfaa3d4a6d682d135322efb3b6..b06ce19e034773b60e8c55b4d545f775989f5939 100644 (file)
--- a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
+++ b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
@@ -40,11 +40,9 @@ site::profile::mysql_server::databases:
 
 site::profile::typo3::projects:
   wissenschaftsjahr:
-    version: '7.6.9'
-    site_path: '/var/www/wissenschaftsjahr'
+    version: '7.6.9' # dummy value
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKoLre5XPzsMdCxCfly4GcvxSmrx4XEXJ9+0p7UV1AjO6dwYOm8qhsWtodG0MwBYXaoKGqTaipeF7eCvsBuE0zNF1+07MOzCWgTwSrR6EIBUybr7Xc04PvoPQllMSvp1CfRGVBbYZ/JIZhtXuiGoP87MKwa0BlIFO+1gXIu+5AFsFpraFeZnB1hmFnsHBJfK/utGmONA1w2hrsYLVnMJ0WO/mubwmKJE92Im7i/1kHXCc+6aVyICGfD+E9On2Ktlq0F8JOoE3CJT/wqryNNSwCb672gTaZYl1UUVBh8wVXK1rByiXOxUMRLgJb6FGQdMNuKwaOf4yhYstSv0tZwsCDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBePGMowQ3L7+7Kk/VI0/UegCC04jr6cPSBijavVA6vwj1e2q2hFqg+lnXh7tX37eMZCA==]
-    db_user: wissenschaft
-    db_name: wissenschaft
+    manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts
     servername: test-web02-bmbf.pixelpark.net
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
@@ -70,6 +68,43 @@ site::profile::typo3::projects:
     mode: '2775'
     php_admin_value:
       max_input_vars: '1500'
+  wissenschaftsjahr-2016-17:
+    version: '7.6.9'
+    site_path: '/var/www/wissenschaftsjahr/2016-17'
+    db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmL6L4Gjwh2CJn7VR3nggYsGrUWGfCc5wyqDENDoN0hpZY3/Z5KYXwqxmgYzYrJQDcz4y7MtqsVaJa43RQNxFvMHm/u0MBq5Lj3gFXiCwERl4iGS2cjC9p64kCB9DygN4SshQb1LssGO08vKi9o3PLPIbu3x2L/f3ntBlh3C7Z1sGnXJTRt1vDPmnennadDpPXPBr1YXO+PjDHPM2aYmK1ObNUSJuj+aSVoO+39/MbKItu1PWGxun8t4LYOJeVX9UO0dRaKe+Jb5Y2n1Pi9ehM4CFh2GGntRhpxKLzSRpVB+7pbw0t4+L9opWlYWYuGegEV30QXgHIjwqGjL4LPL/kjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCGcbqulPE0TFeB6SkB8sOegCCz5uvjwlpS1tq7H1lDffHfCR2OAw8M0xmWWHwJQpSJ6w==]
+    db_user: wissenschaft
+    db_name: wissenschaft
+    servername: test-www-wissenschaftsjahr-2016-17-de.pixelpark.net
+    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:
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server-wissen
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          - local
+    user: service.typo3
+    mode: '2775'
+    php_admin_value:
+      max_input_vars: '1500'
+
+site::profile::flow::manage_php: false # managed by typo3
+site::profile::flow::projects:
+  wissen-flow:
+    version: '3.2.2'
+    servername: test-web02-bmbf-flow.pixelpark.net
+    db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAv/YgY52U5Hg4CqempEu4H7komdKrzdEaTZnaftR0f3gwxi58x9pBnGTS+uBN4gcqJl5Ia9qkOzaM9V3z4ieEgjaMJB9mHzKCQAw/YUgIGESxOI2Qq97LQldIHsD5AKC8pOOX+9VnnPKgvB96y0bOzf4RZ6ww2rkyK7bC6RP0dqTmzJxulzxTs1GJmL7wyTjHtwqrl+lP4yY3A5aGCLjX33jgfiubWLzDmSwFYM9gCGm3NTfM4nAa3rdgmErlplOw3ocAhkA+9NeuJF2BX+u5xqutemL8j7NoArA2fWEhQI0lMeYUMcKxnX12nItOjBxcSeU39cxAhdppdbO9HLwZzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB6koFHOnjGrXThgRL+WFLYgCDiagiv5K+JmVR0y71uDxEABDZJoF4PDdMJtU5bSaJ9Mg==]
+    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'
+    user: service.typo3
 
 site::profile::apache::pp_vhosts:
   wall:
@@ -82,29 +117,3 @@ site::profile::apache::pp_vhosts:
       PassengerStickySessions on
       PassengerNodejs /usr/bin/node
     passenger_app_root: /var/www/wall/
-  flow:
-    docroot: /var/www/wissenschaftsjahr-flow/Web
-    docroot_owner: apache
-    docroot_group: apache
-    servername: test-web02-bmbf-flow.pixelpark.net
-    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'
-    setenv:
-      - 'FLOW_CONTEXT Production'
-    directories:
-      - directory_docroot:
-        provider: 'directory'
-        path: "/var/www/wissenschaftsjahr-flow/Web"
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-wissenschaftsjahr.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-        allow_override:
-          - All
-        directoryindex: 'index.php'
-      - directory_resource:
-        path: "/var/www/wissenschaftsjahr-flow/Web/_Resources"
-        allow_override:
-          - None
-        sethandler: "default-handler"