add needed ssl-cert variables

diff --git a/customer/mbvd-adapter-service/app01-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-adapter-service/app01-mercedes-benz-de.pixelpark.net.yaml
index a4521b9d568cb4e7bda868a3fe7b9a230a67cefb..270f89339f95bff28dd50508ff5b270694573444 100644 (file)
--- a/customer/mbvd-adapter-service/app01-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-adapter-service/app01-mercedes-benz-de.pixelpark.net.yaml
@@ -26,6 +26,8 @@ infra::profile::apache::pp_vhosts:
     servername: app01-mercedes-benz-de.pixelpark.net
     serveraliases:
       - app-mercedes-benz-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'
@@ -55,6 +57,6 @@ infra::profile::apache::pp_vhosts:
         rewrite_cond:
           - '%%{ich-trickse}{HTTPS} !=on [NC]'
         rewrite_rule:
-          - '^(.*)$ https://app01-mercedes-benz-de.pixelpark.net$1 [L,R=301]'          
+          - '^(.*)$ https://app01-mercedes-benz-de.pixelpark.net$1 [L,R=301]'
 
 

diff --git a/customer/mbvd-adapter-service/int-app01-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-adapter-service/int-app01-mercedes-benz-de.pixelpark.net.yaml
index f6e874ffea355a91f82e2f1f8300186db4c49b7c..7e63a1e1837d3274294377037f384661e30deb6a 100644 (file)
--- a/customer/mbvd-adapter-service/int-app01-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-adapter-service/int-app01-mercedes-benz-de.pixelpark.net.yaml
@@ -26,6 +26,8 @@ infra::profile::apache::pp_vhosts:
     servername: int-app01-mercedes-benz-de.pixelpark.net
     serveraliases:
       - int-app-mercedes-benz-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-angebot/web-angebot-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-angebot/web-angebot-mercedes-benz-de.pixelpark.net.yaml
index 57b48aa96da07cc3a40f507cf8b49059cab1a8e4..7dd3e529de5b53175c1004f46922f88d44d6d6f9 100644 (file)
--- a/customer/mbvd-angebot/web-angebot-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-angebot/web-angebot-mercedes-benz-de.pixelpark.net.yaml
@@ -22,6 +22,8 @@ infra::profile::ruby_passenger::projects:
     serveraliases:
       - www-angebot-mercedes-benz-de.pixelpark.net
       - angebot.mercedes-benz.de
+    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-fashionweek/web-fashionweek-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-fashionweek/web-fashionweek-mercedes-benz-de.pixelpark.net.yaml
index 4ca3663a4ac5230f37f7b2ab9c957797de344208..db67b87c75c9e65b585af193c5a99485dca5acc0 100644 (file)
--- a/customer/mbvd-fashionweek/web-fashionweek-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-fashionweek/web-fashionweek-mercedes-benz-de.pixelpark.net.yaml
@@ -20,6 +20,8 @@ infra::profile::wordpress::projects:
       - www.fashionweek-berlin.mercedes-benz.de
       - fashionweek-berlin.mercedes-benz.de
       - www-fashionweek-mercedes-benz-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-sternenlicht/test-web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-sternenlicht/test-web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml
index 4245b4bae7eb3d41ca301da258f0931b490dfae7..ef7db460a64c257b9cccd85260f301d4998d5239 100644 (file)
--- a/customer/mbvd-sternenlicht/test-web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-sternenlicht/test-web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml
@@ -18,6 +18,8 @@ infra::profile::apache::pp_vhosts:
     serveraliases:
       - web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net
     custom_fragment: 'ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/sternenlichtbotschaften/public/$1'
+    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-sternenlicht/web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-sternenlicht/web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml
index 30718fb030e634db913cc9878c04dff441937e90..7f6e78a7ef76c6925117e64cb996616b4899b22a 100644 (file)
--- a/customer/mbvd-sternenlicht/web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-sternenlicht/web-sternenlichtbotschaften-mercedes-benz-de.pixelpark.net.yaml
@@ -17,6 +17,8 @@ infra::profile::apache::pp_vhosts:
     redirect_dest_non_ssl: 'https://sternenlichtbotschaften.mercedes-benz.de/'
     redirect_status_non_ssl: 'permanent'
     ssl: true
+    cert_servername: 'sternenlichtbotschaften.mercedes-benz.de'
+    cert_customer: 'daimler'
     ssl_cert: '/etc/pki/tls/certs/sternenlichtbotschaften.mercedes-benz.de-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/sternenlichtbotschaften.mercedes-benz.de-cert.pem'
     ssl_key: '/etc/pki/tls/private/sternenlichtbotschaften.mercedes-benz.de-key.pem'

diff --git a/customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml b/customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
index 55fd49b26ad2e38d4a6304f39cc917f2b903c416..295c84ba5346bc2e6f6c4d7c433dde282542c24e 100644 (file)
--- a/customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
+++ b/customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
@@ -12,6 +12,8 @@ infra::profile::ruby_passenger::projects:
     serveraliases:
       - transporter-topdeal.de
       - www-mbvd-transporter-topdeal-de.pixelpark.net
+    cert_servername: 'www.transporter-topdeal.de'
+    cert_customer: 'daimler'
     ssl_cert: '/etc/pki/tls/certs/www.transporter-topdeal.de-cert.pem'
     ssl_key: '/etc/pki/tls/private/www.transporter-topdeal.de-key.pem'
     ssl_chain: '/etc/pki/tls/certs/www.transporter-topdeal.de-cert.pem'

diff --git a/customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
index 8311704754ee466224fa97938cb1939818b9f16d..09157bf3280f15c79af934510051d5ea0627a5f8 100644 (file)
--- a/customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
@@ -41,6 +41,8 @@ infra::profile::drupal::projects:
     site_path: '/var/www/trapo-top10/web'
     servername: www01-trapo-top10-mercedes-benz-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/pixelpark/marketing-publicis-ai.pixelpark.net.yaml b/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
index 839f39ce74e1c6b99ae163438ae628179bc95698..f41fe2ab7e68b59bbc1ca0bd7bcbc23d10f982d4 100644 (file)
--- a/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
+++ b/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
@@ -81,6 +81,8 @@ infra::profile::apache::pp_vhosts:
     servername:  marketing-publicis-ai.pixelpark.net # Realserver Name
     serveraliases:
       - campaign.pepperl-fuchs.de # LB VIP
+    cert_servername: 'campaign.pepperl-fuchs.de'
+    cert_customer: 'pepperl-fuchs'
     ssl_cert: '/etc/pki/tls/certs/campaign.pepperl-fuchs.de-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/campaign.pepperl-fuchs.de-cert.pem'
     ssl_key: '/etc/pki/tls/private/campaign.pepperl-fuchs.de-key.pem'