mcdonalds modify webserver docroot

diff --git a/customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml b/customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml
index a1f127de7f35af1eef0422a4b991373f7633f9ff..6fd28cb9f45ea0649f649a8a3f4b37a630ba445e 100644 (file)
--- a/customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml
+++ b/customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml
@@ -51,7 +51,7 @@ infra::profile::apache::htdigest:
 
 infra::profile::apache::pp_vhosts:
   mcdonalds:
-    docroot: /var/www/mcdonalds
+    docroot: /var/www/mcdonalds/public
     servername: dev-www-mcdonalds-de.pixelpark.net # Realserver Name
     serveraliases:
       - dev-build-a-schild-mcdonalds-de.pixelpark.net

diff --git a/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml b/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
index 84007facde15eba33ef62b37d961f9dd2b07154d..7570bda91740811d472f86a0f57cc98a6da1346d 100644 (file)
--- a/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
+++ b/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
@@ -28,7 +28,7 @@ accounts::users:
     apply: true
     groups: apache
     sudo: true
-    
+
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAt5OJ8CE4A0GFRf+/z8kFq3q4fPYebRtPdMQamsXI6i/DRLnzgKTUAwq0CSrpKrrBJF8xHeGVy9pfRR5uysrKUJB5mh3ZcJiUvM43FwXUOrabsmnSUD9MY8odhYDx2UhShm98g8eYA4cggOueSfBrYAU+YF/TBMBsNydjzB26L7kwjRuVq+vdzOHAoSrD3b41PIuROm8+PXrDsKygtQwNFZn3rpiKl8OuyffJrFd5IYHP5hUG8jsgiA0BifMVUb1MdCx+F+dtWhaF7ddLcwID3xFOrxCiD2Cl7lH1LLCIMKjlkL0MCG6m6kbP/rQtewYOd19OuwKsiTxfxUc60pyzATBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAErbPei7s1OVs2RbeQPMKCgCCyLoUnd+0HGHKIdqVslLsIwPAcuocg8/5YNGGjvAPSFA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgSujBL8YOLVV9gPLZGabJnuHuAYIaaleljMLFjFl9eh8fhcXK/K2MmjVvaWUpByylLDccURjKCGOqu3vc03X2UU1zeTh4DkURcTcAv2yO28Ej1To4ud892Y2BCiDcBZRwD3E0hBeLKCe34yhNzzEUBbDLRmWqk6bL2fCfN66WsDtY0kTK01DdAdU+VT27VZ80Rtumo0dO8r0mb2X5WnIQjTc8ghcp0ZYEp6UbDhIwmfSeXmzLuMCQg09sJbwqMMg03Qq28l9I8au4sMpSZATHVxyB/FIdR1MUC9rKApFTn/BSzYh5rlDfJ5JPg//xp7p4jkEiNpTCyENET2iZXZOnTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBQ5vZ/B5PH78oR1u77KKpjgCAitwmBXHyUbuHLBBuMqXxduAg3UjTVVAYYeTeqDGgd/A==]
 infra::profile::mysql_server::databases:
@@ -51,7 +51,7 @@ infra::profile::apache::htdigest:
 
 infra::profile::apache::pp_vhosts:
   mcdonalds:
-    docroot: /var/www/mcdonalds
+    docroot: /var/www/mcdonalds/public
     servername: test-www-mcdonalds-de.pixelpark.net # Realserver Name
     serveraliases:
       - test-build-a-schild-mcdonalds-de.pixelpark.net

diff --git a/customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml b/customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml
index 4792ea9f7d1f4bbe847ec5ab608a10bf5bad08c1..897e39a9f32e9c3cb372af1314b738fb1da4413c 100644 (file)
--- a/customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml
+++ b/customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml
@@ -21,7 +21,7 @@ accounts::users:
   florian.schade:
     apply: true
     groups: apache
-    
+
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZLB8kYmF9OSQr1sn75iSZAIx4ZTOE5LL3zRtC8b+wFIG7kLaBdrBNIksxFOXHlySMWCZP33V7wJR7q1TJEehTf42YbIOnlOZScXMNUqUuElVlzCEGETPXpyM8Qv4gy2nst8E+L9dFc1GgCJV0HhRzdM832oYSKrH127TjB4PZ3myOBSU9P228HysKHPiE9Nz2rRWO5cI/f9KgP8yZjDJB2z1g+RxytdrIWQi4kDOjLGvuWcdxwo/NvydshzJyV2seYYIEQ1OC4Rwi3kAVW19g5d1yuDHOXxqozDb6FhBjhq2CbNmU1Rn/FFVVocUZbiQ+vUTLOBDjb/BAod/CzKs+zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAqbcl7f6c3CBIikkq3un4mgCALtv62YlgS3c3Gh3NFRVB/ukYcxnMG5T6Kp+fkodyW5A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhehuoCcQ54Ugib0akuOD2e/ZKW0Nv0xad8wZ9IRgJKJYceHghq6EX2QE9qJNK8JZJ8A+hbNwA3MoRwfWBARtU9PvJ3CU6hZYkVdByuY51h/DMp5sPrqf5SVJh7nnNGCCjymSsjtcmeNzZeaeK812iIySj4oQMH3/2fLcu9lmxYr1c+XXLNzonYdSmGqbnEGLOx/6eELB8gpOYuae8MnJKifflaoac96l+4DuwjoaTHmvI1U3iJKKAMWzuwd9370TtaZ8OheRAxIIb4fpGypLkh4Fugd+z5n2SIQiBYcJaWL5+7R4jT7l7olJlj/A06bR+shqdQ22NZBabGN45dTorTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDg3/NWjUIDP85s2+Hr+taygCDGjxRr88fXSsAfMo06Ereh7Wd+ulZbBd5mXVDbWVBmpg==]
 infra::profile::mysql_server::databases:
@@ -44,7 +44,7 @@ infra::profile::apache::htdigest:
 
 infra::profile::apache::pp_vhosts:
   mcdonalds:
-    docroot: /var/www/mcdonalds
+    docroot: /var/www/mcdonalds/public
     servername: www-mcdonalds-de.pixelpark.net # Realserver Name
     serveraliases:
       - build-a-schild-mcdonalds-de.pixelpark.net