mcdonalds update yaml syntax

diff --git a/customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml b/customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml
index 5295d5e3a70c17c368bb1868e47ab7513e110afe..0fbb9ba6a0b18782a0084f7a473fa4121c28c971 100644 (file)
--- a/customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml
+++ b/customer/mcdonalds/dev-www-mcdonalds-de.pixelpark.net.yaml
@@ -72,8 +72,8 @@ infra::profile::apache::pp_vhosts:
     docroot_group: apache
     docroot_mode: '2775'
     directories:
-      - directory_root:
-        provider: directory
+      # directory_root:
+      - provider: directory
         path: '/var/www/mcdonalds'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-mcdonalds.sock|fcgi://./" , extensions: '.php' }
@@ -83,8 +83,8 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         directoryindex: index.php index.html
-      - location1:
-        provider: location
+      # location1:
+      - provider: location
         path: '/'
         auth_type: Digest
         auth_name: server

diff --git a/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml b/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
index 626dca54518ded1a6d7e9f6202be8284e40e197b..7fdd0300ad142c2ea17b22124f19b8f6f37fcfcd 100644 (file)
--- a/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
+++ b/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
@@ -72,8 +72,8 @@ infra::profile::apache::pp_vhosts:
     docroot_group: apache
     docroot_mode: '2775'
     directories:
-      - directory_root:
-        provider: directory
+      # directory_root:
+      - provider: directory
         path: '/var/www/mcdonalds'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-mcdonalds.sock|fcgi://./" , extensions: '.php' }
@@ -83,8 +83,8 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         directoryindex: index.php index.html
-      - location1:
-        provider: location
+      # location1:
+      - provider: location
         path: '/'
         auth_type: Digest
         auth_name: server

diff --git a/customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml b/customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml
index 48d48d134c546ff179496891419e5afa8bd5559c..158db1b9f33e1549245b32f812e2a1a306b84f8d 100644 (file)
--- a/customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml
+++ b/customer/mcdonalds/www-mcdonalds-de.pixelpark.net.yaml
@@ -63,8 +63,8 @@ infra::profile::apache::pp_vhosts:
     docroot_group: apache
     docroot_mode: '2775'
     directories:
-      - directory_root:
-        provider: directory
+      # directory_root:
+      - provider: directory
         path: '/var/www/mcdonalds'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-mcdonalds.sock|fcgi://./" , extensions: '.php' }
@@ -74,8 +74,8 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         directoryindex: index.php index.html
-      - location1:
-        provider: location
+      # location1:
+      - provider: location
         path: '/'
         auth_type: Digest
         auth_name: server