From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Tue, 20 Feb 2018 15:18:57 +0000 (+0100)
Subject: spk-blog wordpress + apache_php
X-Git-Tag: v0.1.0~1576
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=38da3a4d0871ca142c329b51158b3320fadab83b;p=pixelpark%2Fhiera.git

spk-blog wordpress + apache_php
---

diff --git a/customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml b/customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml
index 63072ff9..41049e6d 100644
--- a/customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml
+++ b/customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml
@@ -23,6 +23,7 @@ sudo::configs:
 
 infra::additional_classes:
   - infra::profile::wordpress
+  - infra::profile::apache_php
   - apache::mod::headers
   - infra::profile::cron
 
@@ -91,6 +92,7 @@ infra::profile::wordpress::projects:
     setenvif:
       - "HTTPS on HTTPS=on"
 
+infra::profile::apache::pp_vhosts:
   insideforum:
     docroot: /var/www/sparkasseblog
     servername: dev-insideforum.sparkasseblog.de
@@ -101,18 +103,10 @@ infra::profile::wordpress::projects:
     ssl_cert: '/etc/pki/tls/certs/sparkasseblog.de-cert.pem'
     ssl_key: '/etc/pki/tls/private/sparkasseblog.de-key.pem'
     ssl_chain: '/etc/pki/tls/certs/sparkasseblog.de-cert.pem'
-        custom_fragment: |
-          # Webclient Cert Config
-          SSLVerifyClient require
-          SSLCACertificateFile    "/etc/pki/tls/certs/spk-root-ca.pem"
-          SSLCARevocationFile     "/etc/pki/tls/certs/spk-cacrl.pem"
-          SSLCARevocationCheck    "chain"
-          SSLVerifyClient         optional
-          SSLVerifyDepth          2
-#    ssl_verify_client: optional
-#    ssl_crl: '/etc/pki/tls/certs/spk-cacrl.pem'
-#    ssl_ca: '/etc/pki/tls/certs/spk-root-ca.pem'
-#    ssl_verify_depth: '2'
+    ssl_verify_client: optional
+    ssl_crl: '/etc/pki/tls/certs/spk-cacrl.pem'
+    ssl_ca: '/etc/pki/tls/certs/spk-root-ca.pem'
+    ssl_verify_depth: '2'
     directories:
       - location1:
         provider: location