SERVICEDESK-2114 - changed allow override settings and added new db

diff --git a/customer/bmas-sozialrat/www-sozialrat-de.pixelpark.net.yaml b/customer/bmas-sozialrat/www-sozialrat-de.pixelpark.net.yaml
index 2f703057484f3e2c141f3dbf26987bb7f521c14b..6654527c4dde67916eea4369afb76d2d63709ef0 100644 (file)
--- a/customer/bmas-sozialrat/www-sozialrat-de.pixelpark.net.yaml
+++ b/customer/bmas-sozialrat/www-sozialrat-de.pixelpark.net.yaml
@@ -15,6 +15,9 @@ infra::profile::mysql_server::databases:
   sozialbeirat:
     user: sozialbeirat
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOMvB2spCMFBGb3BP02tZX07c9HrT4PbRta9v1Kq1FfK2Luv0+Eoycpom3z862GuwInJtYlm6p6x3yQ7b3JdLFJOhXWpxYTbpubPfHBxoMZYCFwV1tkJw3H2mRS8gjw6B7bXt2Mvliu8mVPA1tp1JbI0Oh5zoNvm+HnfY5950l0fWPtZNonrJP2p2NDDcbQSMrWc2Zt/NeYx73WLVsf+rr+AfsgsuakBwldLL2DtU4LPajOEqfegOBAVzlfKEvj4lRVQXquwkU38fiBdPlDUotn07Dy3bn4WJoVAZrI0uTS1ys1+TXVqrNvA6KVSqqjkN10SS9E9GJFiufV3G6x3aFTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBiOwQ4QlW9Q4YceC4w1DJ3gCAf5lntJQ6Tpz6rpFzC40W68bf1KBuq7i/Io5cpeXONfQ==]
+  generationenvertrag:
+    user: generation
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAN+/T6v/vm0JQBelkCogsI1gs05GbZbNrHAzqNTXXKTFwDS5O9VwsgTvRdeiAMz3yeRqb/qrDyMU1RJ1btyYniUrbHR7IkRcS5bJ3ns5awg2c1VPJDVN8KRjmpQRYT0oYNc2ljuPRxFfRghJQTRFo+WhiBdOPf5t02EyyXjslgF9sLMFxRvRFKFY7mR84vfL6isT2maeIfuYgLN95OqWF3vDMKkmy8AhBqk1kQ0VINRMv6fRid9zIcsHV6S0lAjPSEzYMnMzoOJQo1xrSwDmag6iHCATGha4KCW6wESiLAp1sFt1jzIQqbjGFU+EAPECcQ6Ns5gV++K5ww+gWgUh50DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC6MBVAk/xMnMM5knHEJUR/gCBBuY0WuhtMisAaRDR6HipaVl5nb61V/pSNTYBjv5dE1Q==]
 
 infra::profile::apache_php::pp_vhosts:
   sozialbeirat:
@@ -37,11 +40,9 @@ infra::profile::apache_php::pp_vhosts:
         path: '/var/www/html/sozialrat'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-sozialbeirat.sock|fcgi://." , extensions: '.php' }
-        options:
-          - FollowSymLinks
-          - MultiViews
         allow_override:
-          - None
+          - FileInfo
+          - 'Options=MultiViews,Indexes,FollowSymLinks'
   generationenvertrag:
     servername: www-generationenvertrag-de.pixelpark.net
     serveraliases:
@@ -62,8 +63,6 @@ infra::profile::apache_php::pp_vhosts:
         path: '/var/www/html/generationenvertrag'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-generationenvertrag.sock|fcgi://." , extensions: '.php' }
-        options:
-          - FollowSymLinks
-          - MultiViews
         allow_override:
-          - None
+          - FileInfo
+          - 'Options=MultiViews,Indexes,FollowSymLinks'