]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
add needed ssl-cert variables
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Wed, 12 Apr 2017 12:01:57 +0000 (14:01 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Wed, 12 Apr 2017 12:01:57 +0000 (14:01 +0200)
customer/pixelpark/foreman02.pixelpark.com.yaml

index 6161ee4b4d88a9bf1c0f8b6f04771b97bbdcc817..cd7963b017025f7bf8013d21d642dfd2cb192867 100644 (file)
@@ -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'