add needed ssl variables

diff --git a/customer/bmbf/test-web01-bmbf.pixelpark.net.yaml b/customer/bmbf/test-web01-bmbf.pixelpark.net.yaml
index e50fe9f41b4a2cca77b8bc187a45e7e8a7ed85aa..df016b75c9e995609f8ccdda8664348123b09324 100644 (file)
--- a/customer/bmbf/test-web01-bmbf.pixelpark.net.yaml
+++ b/customer/bmbf/test-web01-bmbf.pixelpark.net.yaml
@@ -20,6 +20,8 @@ infra::profile::typo3::projects:
     site_path: '/srv/www/stadtklang'
     version: '6.2.30'
     ssl_real: true
+    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/bmbf/test-web02-bmbf.pixelpark.net.yaml b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
index 5f474584db2ff12e5f25239e5d398919b3e387c1..76936741e8241466432206bbcb2a989d4aeb806e 100644 (file)
--- a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
+++ b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
@@ -44,6 +44,8 @@ infra::profile::typo3::projects:
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKoLre5XPzsMdCxCfly4GcvxSmrx4XEXJ9+0p7UV1AjO6dwYOm8qhsWtodG0MwBYXaoKGqTaipeF7eCvsBuE0zNF1+07MOzCWgTwSrR6EIBUybr7Xc04PvoPQllMSvp1CfRGVBbYZ/JIZhtXuiGoP87MKwa0BlIFO+1gXIu+5AFsFpraFeZnB1hmFnsHBJfK/utGmONA1w2hrsYLVnMJ0WO/mubwmKJE92Im7i/1kHXCc+6aVyICGfD+E9On2Ktlq0F8JOoE3CJT/wqryNNSwCb672gTaZYl1UUVBh8wVXK1rByiXOxUMRLgJb6FGQdMNuKwaOf4yhYstSv0tZwsCDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBePGMowQ3L7+7Kk/VI0/UegCC04jr6cPSBijavVA6vwj1e2q2hFqg+lnXh7tX37eMZCA==]
     manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts
     servername: test-web02-bmbf.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'
@@ -77,6 +79,8 @@ infra::profile::typo3::projects:
     db_user: wissenschaft
     db_name: wissenschaft
     servername: test-web02-bmbf-2016-17.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'
@@ -106,6 +110,8 @@ infra::profile::flow::projects:
     version: '3.2.2'
     servername: test-web02-bmbf-flow.pixelpark.net
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAAv/YgY52U5Hg4CqempEu4H7komdKrzdEaTZnaftR0f3gwxi58x9pBnGTS+uBN4gcqJl5Ia9qkOzaM9V3z4ieEgjaMJB9mHzKCQAw/YUgIGESxOI2Qq97LQldIHsD5AKC8pOOX+9VnnPKgvB96y0bOzf4RZ6ww2rkyK7bC6RP0dqTmzJxulzxTs1GJmL7wyTjHtwqrl+lP4yY3A5aGCLjX33jgfiubWLzDmSwFYM9gCGm3NTfM4nAa3rdgmErlplOw3ocAhkA+9NeuJF2BX+u5xqutemL8j7NoArA2fWEhQI0lMeYUMcKxnX12nItOjBxcSeU39cxAhdppdbO9HLwZzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB6koFHOnjGrXThgRL+WFLYgCDiagiv5K+JmVR0y71uDxEABDZJoF4PDdMJtU5bSaJ9Mg==]
+    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'
@@ -118,6 +124,8 @@ infra::profile::apache::pp_vhosts:
   wall:
     docroot: /var/www/wall/public
     servername: test-web02-bmbf-wall.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 +136,8 @@ infra::profile::apache::pp_vhosts:
   abc-der-menschheit:
     docroot: /var/www/wissenschaftsjahr/2007
     servername: test-abc-der-menschheit-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 +159,8 @@ infra::profile::apache::pp_vhosts:
   jahr-der-mathematik:
     docroot: /var/www/wissenschaftsjahr/2008
     servername: test-jahr-der-mathematik-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'
@@ -170,6 +182,8 @@ infra::profile::apache::pp_vhosts:
   forschungsexpedition:
     docroot: /var/www/wissenschaftsjahr/2009
     servername: test-www-forschungsexpedition-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'
@@ -191,6 +205,8 @@ infra::profile::apache::pp_vhosts:
   zukunft-der-energie:
     docroot: /var/www/wissenschaftsjahr/2010
     servername: test-www-zukunft-der-energie-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'
@@ -212,6 +228,8 @@ infra::profile::apache::pp_vhosts:
   forschung-fuer-unsere-gesundheit:
     docroot: /var/www/wissenschaftsjahr/2011
     servername: test-www-forschung-fuer-unsere-gesundheit-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'
@@ -233,6 +251,8 @@ infra::profile::apache::pp_vhosts:
   zukunftsprojekt-erde:
     docroot: /var/www/wissenschaftsjahr/2012
     servername: test-www-zukunftsprojekt-erde-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'
@@ -254,6 +274,8 @@ infra::profile::apache::pp_vhosts:
   pioniere-des-demografischen-wandels:
     docroot: /var/www/wissenschaftsjahr/2013
     servername: test-pioniere-des-demografischen-wandels-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'
@@ -275,6 +297,8 @@ infra::profile::apache::pp_vhosts:
   digital-ist:
     docroot: /var/www/wissenschaftsjahr/2014
     servername: test-digital-ist-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'
@@ -296,6 +320,8 @@ infra::profile::apache::pp_vhosts:
   wissenschaftsjahr-zukunftsstadt:
     docroot: /var/www/wissenschaftsjahr/2015
     servername: test-www-wissenschaftsjahr-zukunftsstadt-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/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml
index 92ea949b0d364ff07cc48538aa1f3dbbe317a0c5..d278dce7c4e0f7f8d0107001aae144a17e6a10c7 100644 (file)
--- a/customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml
+++ b/customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml
@@ -49,6 +49,8 @@ infra::profile::typo3::projects:
     db_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqAPfjkpxjcB5OcaggCEMoZHgfmgXMVfpG0ND7UBSK8O0nYKGS7Z7CP1SrrRXxU3HmSiwhm0t8BE7j1E4wtkeacvv8rxDN85FE84RtDO08ZYNH48SZ/FUpXbLtAAyuP+wF2ZGBHtjGGYHYDP0XJpACTVgExkN8vyNa8N7Y5OPZwfohbDZQZEo2kY0NXeNnGEPKVgzDQevtlbScWk2ut8xDf0hL0aqa/K+iDqC1OufylB1VLoDEWWKKU8baxwZTVf4f4GfbkF96tqt+RTMfh08Zxlq7UOK1bZNvkKs/ThxsxffmtMhkcBnB8x7L+Ft2+ylK7SBwql+CuwJmE6Xiq0hFDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCiYj0KHXpkMN7Rn5o+9LC8gBBoSH581Kj/zsC951SN/uis]
     db_user: buschjaeger
     db_name: buschjaeger
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
     servername: test-web-buschjaeger-de.pixelpark.net
     ssl_cert: '/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-bannershop/stage-web-bannershop-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-bannershop/stage-web-bannershop-mercedes-benz-de.pixelpark.net.yaml
index 427aee706fff34780c6a7d316047a35da0331099..f24f3faa51561b6dd7e13cb97feed5f31563552c 100644 (file)
--- a/customer/mbvd-bannershop/stage-web-bannershop-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-bannershop/stage-web-bannershop-mercedes-benz-de.pixelpark.net.yaml
@@ -15,6 +15,8 @@ infra::profile::ruby_passenger::projects:
     servername: stage-web-bannershop-mercedes-benz-de.pixelpark.net
     serveraliases:
       - stage-www-bannershop-mercedes-benz-de.pixelpark.net # Domain for LB IP
+    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-europadialog/test-dialog-mercedes-benz-com-pickup.pixelpark.net.yaml b/customer/mbvd-europadialog/test-dialog-mercedes-benz-com-pickup.pixelpark.net.yaml
index 23f65e1260b8aa246b9b16388c3df1ea964ef2cd..1849617ac1739da67f9fc4baa453db498d4aee05 100644 (file)
--- a/customer/mbvd-europadialog/test-dialog-mercedes-benz-com-pickup.pixelpark.net.yaml
+++ b/customer/mbvd-europadialog/test-dialog-mercedes-benz-com-pickup.pixelpark.net.yaml
@@ -20,6 +20,8 @@ infra::profile::ruby_passenger::projects:
     servername: test-dialog-mercedes-benz-com-pickup.pixelpark.net # WAF Domain
     serveraliases:
       - lb-test-dialog-mercedes-benz-com-pickup.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/stage-web-mbvd-service-de.pixelpark.net.yaml b/customer/mbvd-service/stage-web-mbvd-service-de.pixelpark.net.yaml
index f8ef4d3da858a1e458c5cf79301305625db07c9c..238cda12cf1974f6d5b8daf2ae8165776741d5df 100644 (file)
--- a/customer/mbvd-service/stage-web-mbvd-service-de.pixelpark.net.yaml
+++ b/customer/mbvd-service/stage-web-mbvd-service-de.pixelpark.net.yaml
@@ -16,6 +16,8 @@ infra::profile::ruby_passenger::projects:
     serveraliases:
       - service.mercedes-benz.com
       - stage-web-mbvd-service-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/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml b/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
index 7570bda91740811d472f86a0f57cc98a6da1346d..8067ed734af660c99a633a30ce51a76a06824f41 100644 (file)
--- a/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
+++ b/customer/mcdonalds/test-www-mcdonalds-de.pixelpark.net.yaml
@@ -55,6 +55,8 @@ infra::profile::apache::pp_vhosts:
     servername: test-www-mcdonalds-de.pixelpark.net # Realserver Name
     serveraliases:
       - test-build-a-schild-mcdonalds-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'