From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Tue, 11 Apr 2017 13:20:36 +0000 (+0200)
Subject: add needed ssl-cert variables
X-Git-Tag: v0.1.0~3256
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=8f41108f8ba6dc2219a528decdd4a979981c2de4;p=pixelpark%2Fhiera.git

add needed ssl-cert variables
---

diff --git a/customer/bmf-datacenter/test.yaml b/customer/bmf-datacenter/test.yaml
index 061748e7..ec112150 100644
--- a/customer/bmf-datacenter/test.yaml
+++ b/customer/bmf-datacenter/test.yaml
@@ -83,6 +83,8 @@ infra::profile::typo3::projects:
     db_user: datacenter
     db_name: bundeshaushalt
     servername: test-web01-bundeshaushalt-info.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
@@ -128,6 +130,8 @@ infra::profile::wordpress::projects:
   so-klingt-europa-de:
     docroot: '/var/www/so-klingt-europa-de'
     servername: test-www-so-klingt-europa-de.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
@@ -149,6 +153,8 @@ infra::profile::drupal::projects:
   rfm-geschichte:
     site_path: '/var/www/rfm-geschichte/web'
     servername: test-www-reichsfinanzministerium-geschichte-de.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'    
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
diff --git a/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml b/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
index 7cd3b124..67c8920a 100644
--- a/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
+++ b/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
@@ -17,6 +17,8 @@ infra::profile::ruby_passenger::projects:
     serveraliases:
       - test-web-e-klasse-t-modell-ch.pixelpark.net # Realserver Domain
       - lb-test-www-e-klasse-t-modell-ch.pixelpark.net # LB Domain
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'      
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
diff --git a/customer/mbvd-service-and-smile/test-www-service-and-smile-de-mbvd.pixelpark.net.yaml b/customer/mbvd-service-and-smile/test-www-service-and-smile-de-mbvd.pixelpark.net.yaml
index 11787b7a..c63755dd 100644
--- a/customer/mbvd-service-and-smile/test-www-service-and-smile-de-mbvd.pixelpark.net.yaml
+++ b/customer/mbvd-service-and-smile/test-www-service-and-smile-de-mbvd.pixelpark.net.yaml
@@ -13,6 +13,8 @@ infra::profile::drupal::projects:
     servername: test-www-service-and-smile-de-mbvd.pixelpark.net
     serveraliases:
       - test-www-service-and-smile-de
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'      
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
diff --git a/customer/mbvd-transporter-topdeal/test-www-mbvd-transporter-topdeal-de.pixelpark.net.yaml b/customer/mbvd-transporter-topdeal/test-www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
index 8c5b4528..da2f7b5f 100644
--- a/customer/mbvd-transporter-topdeal/test-www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
+++ b/customer/mbvd-transporter-topdeal/test-www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
@@ -13,6 +13,8 @@ infra::profile::apache::htdigest:
 infra::profile::ruby_passenger::projects:
   transporter-topdeal:
     servername: test-www-mbvd-transporter-topdeal-de.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'    
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
diff --git a/customer/mbvd-transporter-training/test-www-transporter-training-on-tour-de.pixelpark.net.yaml b/customer/mbvd-transporter-training/test-www-transporter-training-on-tour-de.pixelpark.net.yaml
index bd1e3e91..dff9acdf 100644
--- a/customer/mbvd-transporter-training/test-www-transporter-training-on-tour-de.pixelpark.net.yaml
+++ b/customer/mbvd-transporter-training/test-www-transporter-training-on-tour-de.pixelpark.net.yaml
@@ -15,6 +15,8 @@ infra::profile::drupal::projects:
     site_path: '/var/www/transporter-training'
     servername: test-www-transporter-training-on-tour-de.pixelpark.net
     serveraliases:
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'      
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
diff --git a/customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml b/customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml
index 214aae8c..4c0f5f76 100644
--- a/customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml
+++ b/customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml
@@ -90,7 +90,7 @@ infra::profile::typo3::projects_composer_monolith:
     serveraliases:
       - www-schlaganfall-verhindern-de.pixelpark.net
       - web-schlaganfall-verhindern-de.pixelpark.net
-    # Change Cert
+    # Change Cert    
     ssl_cert: '/etc/pki/tls/certs/www.schlaganfall-verhindern.de-cert.pem'
     ssl_key: '/etc/pki/tls/private/www.schlaganfall-verhindern.de-key.pem'
     ssl_chain: '/etc/pki/tls/certs/www.schlaganfall-verhindern.de-cert.pem'
@@ -127,6 +127,8 @@ infra::profile::typo3::projects_composer_monolith:
     servername: test-www-schlaganfall-verhindern-de.pixelpark.net
     serveraliases:
       - test-web-schlaganfall-verhindern-de.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
diff --git a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
index 19ed9882..ac64c3da 100644
--- a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
@@ -52,6 +52,8 @@ infra::profile::drupal::projects:
     site_path: /srv/www/test-bi.pfizer.de
     servername: test-bi-pfizer-de.pixelpark.net
     ssl: true
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
@@ -117,6 +119,8 @@ infra::profile::typo3::projects:
       - test-redaktion-rauchfrei-durchstarten-de.pixelpark.net # kein DNS
       - test-redaktion-lyrica-de.pixelpark.net # kein DNS
     ssl: true
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
@@ -646,6 +650,8 @@ infra::profile::apache::pp_vhosts:
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
@@ -722,6 +728,8 @@ infra::profile::apache::pp_vhosts:
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
@@ -770,6 +778,8 @@ infra::profile::apache::pp_vhosts:
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
@@ -813,6 +823,8 @@ infra::profile::apache::pp_vhosts:
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'    
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
diff --git a/customer/q_perior/test-www-q-perior.pixelpark.net.yaml b/customer/q_perior/test-www-q-perior.pixelpark.net.yaml
index 4dd303ad..a1b0fb5c 100644
--- a/customer/q_perior/test-www-q-perior.pixelpark.net.yaml
+++ b/customer/q_perior/test-www-q-perior.pixelpark.net.yaml
@@ -47,6 +47,8 @@ infra::profile::wordpress::projects:
   q-perior:
     docroot: '/var/www/q-perior'
     servername: test-www-q-perior.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'    
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'