From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Thu, 20 Apr 2017 09:12:49 +0000 (+0200)
Subject: ODT - fix apache
X-Git-Tag: v0.1.0~3119
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=17c1d9519fe007ea14dcfec65babf60d5ec368ac;p=pixelpark%2Fhiera.git

ODT - fix apache
---

diff --git a/customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml
index e22fc21a..35360f6e 100644
--- a/customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml
@@ -21,9 +21,8 @@ infra::profile::apache::pp_vhosts:
     #ssl_crl: '/etc/pki/tls/certs/odt-cacrl.pem'
     ssl_ca: '/etc/pki/tls/certs/odt-root-ca.pem'
     rewrites_non_ssl:
-      - https:
-        comment: 'almost all to https'
-        rewritecond:
+      - comment: 'almost all to https'
+        rewrite_cond:
           - '%{ich-trickse}{REQUEST_URI} !^(/.\.html|/emm_webservice)$'
         rewrite_rule:
           - '^(.*)$ https://odt-daimler-com.pixelpark.net$1 [L,R=301]'
@@ -31,11 +30,9 @@ infra::profile::apache::pp_vhosts:
     proxy_pass:
       - { path: /, url: 'ajp://localhost:8009/' }
     directories:
-      - webservice:
-        provider: location
+      - provider: location
         path: '/emm_webservice'
         require:
           - 'ip 93.188.107.192/26'
           - 'ip 217.66.50.0/24'
           - 'ip 217.66.51.0/24'
-        ssl_verify_client: none