From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Wed, 12 Apr 2017 12:01:57 +0000 (+0200)
Subject: add needed ssl-cert variables
X-Git-Tag: v0.1.0~3202
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=631943c033b5ab14d78452b642589af535ab572e;p=pixelpark%2Fhiera.git

add needed ssl-cert variables
---

diff --git a/customer/pixelpark/foreman02.pixelpark.com.yaml b/customer/pixelpark/foreman02.pixelpark.com.yaml
index 6161ee4b..cd7963b0 100644
--- a/customer/pixelpark/foreman02.pixelpark.com.yaml
+++ b/customer/pixelpark/foreman02.pixelpark.com.yaml
@@ -3,7 +3,7 @@ infra::role: base
 infra::additional_classes:
   - python
   - infra::profile::apache
-  - apache::mod::passenger 
+  - apache::mod::passenger
 
 
 apache::mod::passenger::passenger_pool_idle_time: 600
@@ -17,10 +17,12 @@ infra::profile::apache::pp_vhosts:
     serveraliases:
       - foreman01.pixelpark.com
     docroot: /var/lib/foreman/public/
+    cert_servername: 'wildcard.pixelpark.com'
+    cert_customer: 'pixelpark'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem'
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
-    ssl_ca: '/var/lib/puppet/ssl/certs/ca.pem'
+#    ssl_ca: '/var/lib/puppet/ssl/certs/ca.pem'
     ssl_verify_client: optional
     ssl_options:
       - '+StdEnvVars'
@@ -29,6 +31,8 @@ infra::profile::apache::pp_vhosts:
     redirect_dest_non_ssl: https://foreman.pixelpark.com/
   puppetboard:
     servername: puppetboard.pixelpark.com
+    cert_servername: 'wildcard.pixelpark.com'
+    cert_customer: 'pixelpark'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem'
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'