added live family of the year env

diff --git a/customer/mbvd-familyoftheyear/test-www-familyoftheyear-de.pixelpark.net.yaml b/customer/mbvd-familyoftheyear/test-www-familyoftheyear-de.pixelpark.net.yaml
index 4973c9b2e969e362d0c6b42a528c1dc5847e46d7..7f0fc1da90de84872d1a1dda13299e21c8ef5ffd 100644 (file)
--- a/customer/mbvd-familyoftheyear/test-www-familyoftheyear-de.pixelpark.net.yaml
+++ b/customer/mbvd-familyoftheyear/test-www-familyoftheyear-de.pixelpark.net.yaml
@@ -19,18 +19,16 @@ site::profile::ruby_passenger::projects:
     passenger_user: family
     passenger_app_env: stage
     # for capistrano deployment
-    approot: /var/www/familyoftheyear/current
-    manage_approot: false
+    approot: /var/www/familyoftheyear
     directories:
       - directory_root:
         provider: directory
-        path: '/var/www/familyoftheyear/current/public'
+        path: '/var/www/familyoftheyear/public'
         options:
           - FollowSymLinks
           - MultiViews
         allow_override:
           - All
-        directoryindex: index.php index.html
       - location1:
         provider: location
         path: '/'

diff --git a/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net b/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net.yaml b/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net.yaml
new file mode 100644 (file)
index 0000000..cda3ae6
--- /dev/null
+++ b/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net.yaml
@@ -0,0 +1,40 @@
+---
+mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABkCaNYbtyHq96hmp7pRH45MFexXQCQrveN2iw+97ut0Z/UVTEbjKRpAbSm3Xy3WqMG0wKViyXChvVEAd0fkO21BmtLYQxGykUDTO5P+p7N6o4CRqr7PCgwsJEAxG6ziu6I9215rcJ3y459BvvNcBHp8bXTw8wNmLTig4A80rRpTbG7Ed2aIsSmjYQfB3pPEgrZqX8qXEPWY5heO97z4Hdvw/+xiPcAmVoVbmBxDplcHR4GrwzSBGn6mkSAbodWJd/AjTGhi8sclMaYm0+f4KbLhjpTFyS68p//Z++U7ztQ1dYH1b7AFJwuBJxclKM8O9vzZqnX84KrEuMTvFvbBaEjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCKeao/LIIgjuRR412M5/RRgCDBZAI+uX12Ik+/Y3b8N4z6kocvCt4gFo8eEDWS65Jc4A==]
+mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWc3+NQJUUwqoJuo/Je7s1zGrT94lwHJvRcgYs+JB+niILR7ArK0R9+sPuPoiuZO3l11pv+RTSjbU7AsfsqvaU0C0iFjoNGjnG/Oqw3TVuMdoBvEH0lqmFfvGrdGWNEBSFBRiLpcQAfJGmlQoBDMYOvad6vVlX6PubZVwLuze7M4hYr1DPFsNnI6s0rGQiIU/x+8q5sHEv2doRWwe1LUcJOZk0ucSMQZ9B9UOXwPkPFQOiIDNdaFIr2Qexn9u6ABBcOYYsAbRj8bdGpSZ6dslhZ6kbOwgwJzyqpLHJnHa+Y51JC/yn6pFvayPqRcV1HNjzBvpHlc7oz+c5XCjcDqCMzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAY2d4Nu0CsU+MK0MAXA2IHgCA4E3fF9uJDigm5QvwcR+wxTt4BbRdBjk/TK4JO1O8o1w==]
+site::profile::mysql_server::databases:
+  family:
+    user: family
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAE9k1rfgybpxMgIbnKeasomIcTn3Llcuk+Z28MKw9SICgr8JONfbCij13XzclMafyYorUO++4VO9OgYVkxQqjzgm0Dq/7yFQNKGfzwPgtFuu7roZwWJGXCZYC3Mnpmp+uwb/5AxoDhsbElf6qj3JzZD/OvJOo2670ESEgtYfsEa47SrYzAdP9MsWgZLNzkOoNho8/CR0Ir7XOTHOjiAbnNxlcXNnQ/ajEN0pDuZz/UZylvY12ucoELsLaF//oQpacxYLYZq+hVY1rufS0at5z2nLg81BKIqoCZH7gi4G7RpZ/wppmyH+OJqed6kIBLKmcZwS/aihiSq+gIQxoK+dK8TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDAZNjnc++ATc37TwEUWqA2gCAd4kgaUDWJ8qiw1QY1DjYuse0OecqM55nZ9cn0RtgFDw==]
+
+site::profile::apache::htdigest:
+  server:
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOM3QVynm3lcBD2LtqkCtqVeSIKtYNfJ+ldUAe7Xgubx+XiRbWRQBiqDbI/Ymn+r2oQfv+8XsEzTSJLZLOGrE4TNEo52VBBGPU8YxPQDQDNtfDuArmsVE+c6Vt3pyu5aEscM3GslolQ6hXHa7W7jgcXZu0ggkcgkDzKCt/AmRex/zLnlZzsMdUZ+SYJrIEgvE/jifCzT8bZzQyrEU1kcxXMgeBE3iHc9ju+oqaxM/X8DkvlIoR8/p1vT61sMn7mdARhAX0ecLis7th9pEwsQ9GYgGXHwA2PT50uQuXdLi7/XfT+orNWKKhl31sTwsM6TO62xg99ujMqn3XT8Gt3nabjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCp8em9en7u0ptTKn1Bl8bpgCAFNPBwnr2N2Frbg8F7BD2z/+oBrl8eZhh1En3Cz0Mcog==]
+
+site::profile::ruby_passenger::projects:
+  family:
+    servername: www-familyoftheyear-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'
+    passenger_user: family
+    passenger_app_env: live
+    # for capistrano deployment
+    approot: /var/www/familyoftheyear
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/familyoftheyear/public'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'