From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Thu, 13 Apr 2017 12:35:56 +0000 (+0200)
Subject: mcdonalds update yaml syntax
X-Git-Tag: v0.1.0~3166
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=caf4e2644fdb8a4abcd1049b5cdf4262ed5b8cd9;p=pixelpark%2Fhiera.git

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 5295d5e3..0fbb9ba6 100644
--- 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 626dca54..7fdd0300 100644
--- 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 48d48d13..158db1b9 100644
--- 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