From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Thu, 13 Apr 2017 12:32:44 +0000 (+0200)
Subject: marketing-publicis-ai update yaml syntax
X-Git-Tag: v0.1.0~3168
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=0e242c2fcdd19e381d0656b076dc9dc8dc473653;p=pixelpark%2Fhiera.git

marketing-publicis-ai update yaml syntax
---

diff --git a/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml b/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
index 8f3e81bc..3baee669 100644
--- a/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
+++ b/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
@@ -90,8 +90,8 @@ infra::profile::apache::pp_vhosts:
     docroot_group: apache
     docroot_mode: '2775'
     directories:
-      - directory_root:
-        provider: directory
+      # directory_root:
+      - provider: directory
         path: '/var/www/marketing'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-marketing.sock|fcgi://./" , extensions: '.php' }
@@ -102,8 +102,7 @@ infra::profile::apache::pp_vhosts:
           - All
         directoryindex: index.php index.html
 
-#      - location1:
-#        provider: location
+#      - provider: location
 #        path: '/'
 #        auth_type: Digest
 #        auth_name: server
@@ -112,8 +111,7 @@ infra::profile::apache::pp_vhosts:
 #        auth_user_file: '/etc/httpd/htdigest'
 #        auth_require: 'valid-user'
 
-#      - location2
-#        provider: 'location'
+#      - provider: 'location'
 #        path: '/s/'
 #        require: 'ip 217.66.50.0/24'
 #        require: 'ip 217.66.51.0/24'
@@ -129,14 +127,12 @@ infra::profile::apache::pp_vhosts:
     setenvif_ssl:
       - 'HTTPS on HTTPS=on'
     rewrites:
-      - alias:
-        comment: 'Weiterleitung auf https'
+      - comment: 'Weiterleitung auf https'
         rewrite_cond:
           - '%%{ich-trickse}{HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://campaign.pepperl-fuchs.de$1 [R=301,L]'
-      - alias1:
-        comment: 'Weiterleitung auf Unterseite'
+      - comment: 'Weiterleitung auf Unterseite'
         rewrite_cond:
           - '%%{ich-trickse}{ENV:mautic_access} !=true'
           - '%%{ich-trickse}{REQUEST_URI} ^/s/login'
diff --git a/customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml b/customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml
index 265b998b..b0a505e0 100644
--- a/customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml
+++ b/customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml
@@ -96,8 +96,7 @@ infra::profile::apache::pp_vhosts:
     docroot_group: apache
     docroot_mode: '2775'
     directories:
-      - directory_root:
-        provider: directory
+      - provider: directory
         path: '/var/www/marketing'
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-marketing.sock|fcgi://./" , extensions: '.php' }
@@ -107,8 +106,7 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         directoryindex: index.php index.html
-      - location1:
-        provider: location
+      - provider: location
         path: '/'
         auth_type: Digest
         auth_name: server