bmbf - create on top and sub projects

diff --git a/customer/bmbf/web02-bmbf.pixelpark.net.yaml b/customer/bmbf/web02-bmbf.pixelpark.net.yaml
index 513cc8d8b5e0fda43d05755ba5d8956f4f8070bf..fe453e8593e9f869b0698e72f595d4c736e90a0c 100644 (file)
--- a/customer/bmbf/web02-bmbf.pixelpark.net.yaml
+++ b/customer/bmbf/web02-bmbf.pixelpark.net.yaml
@@ -35,14 +35,9 @@ site::profile::mysql_server::databases:
     user: wissen-flow
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAYnPivC9JfsjPIgkHRj83GrMU3qfcvlYti6XSyR8GeMRBn1I6OTeJ4SkE5PptgjYJLgo3D1iThf5nDyn9QMR0nDiJhHQR+lL1nk4+5zoH4FcE9fFWFxf6ehyAANJ1N/Fc13VujJh5juHWdvVvMpXGT3y7neU8gulURQA21jcFSP56CwHWuqdViTC/lcvATLKJHUftUtj44C00tn1C+HhMYxB1caduGPyq/qN8pd26mks0pfuGIutcJbn3+KK+Pfs7xtl2V+ueA+VWCvUJUO59IDYvFCNQV3Z9uWwXV0tDk6pm5uC6RKIR0L42/Ir8bmoSsV6SquwmYbJrUbR23DMXDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAdmauxdiiH7MFB84aoLVYwgCAPQpOO5UEMbCT5KSGFAeIIeYwZ9S8bMszMKV0EqN/XOg==]
 
-
 site::profile::typo3::projects:
   wissenschaftsjahr:
-    version: '7.6.9'
-    site_path: '/var/www/wissenschaftsjahr'
-    db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmL6L4Gjwh2CJn7VR3nggYsGrUWGfCc5wyqDENDoN0hpZY3/Z5KYXwqxmgYzYrJQDcz4y7MtqsVaJa43RQNxFvMHm/u0MBq5Lj3gFXiCwERl4iGS2cjC9p64kCB9DygN4SshQb1LssGO08vKi9o3PLPIbu3x2L/f3ntBlh3C7Z1sGnXJTRt1vDPmnennadDpPXPBr1YXO+PjDHPM2aYmK1ObNUSJuj+aSVoO+39/MbKItu1PWGxun8t4LYOJeVX9UO0dRaKe+Jb5Y2n1Pi9ehM4CFh2GGntRhpxKLzSRpVB+7pbw0t4+L9opWlYWYuGegEV30QXgHIjwqGjL4LPL/kjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCGcbqulPE0TFeB6SkB8sOegCCz5uvjwlpS1tq7H1lDffHfCR2OAw8M0xmWWHwJQpSJ6w==]
-    db_user: wissenschaft
-    db_name: wissenschaft
+    manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts
     servername: www.wissenschaftsjahr.de
     serveraliases:
       - wissenschaftsjahr.de
@@ -84,6 +79,41 @@ site::profile::typo3::projects:
           - '%%{ich-trickse}{HTTP_HOST} ^wissenschaftsjahr.de$'
         rewrite_rule:
           - '^(.*)$ https://www.wissenschaftsjahr.de$1 [L,R=301]'
+    user: service.typo3
+    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: 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
+      - location2:
+        provider: location
+        path: '/typo3/sysext/'
+      - location3:
+        provider: location
+        path: '/typo3/js/'
+      - location4:
+        provider: location
+        path: '/typo3/contrib/'
     rewrites_ssl:
       - sitemap:
         comment: 'sitemap BMBFWJDC-2513'
@@ -93,6 +123,7 @@ site::profile::typo3::projects:
     mode: '2775'
     php_admin_value:
       max_input_vars: '1500'
+
 site::profile::flow::manage_php: false # managed by typo3
 site::profile::flow::projects:
   wissen-flow: