add needed ssl-cert variables

diff --git a/customer/emperra/portal-esysta-com.pixelpark.net.yaml b/customer/emperra/portal-esysta-com.pixelpark.net.yaml
index 65f4d9c887661de8ebb0bbab892e55660003fb50..0e64ce69e5e08e40c4e32c3a87dbf41cb5c80dbf 100644 (file)
--- a/customer/emperra/portal-esysta-com.pixelpark.net.yaml
+++ b/customer/emperra/portal-esysta-com.pixelpark.net.yaml
@@ -232,7 +232,7 @@ python::python_pips:
     virtualenv: '/var/lib/python-venv/esysta'
     owner: dialog
     group: emperra
-    
+
 apache::default_vhost: false
 apache::mpm_module: event
 
@@ -330,9 +330,11 @@ infra::profile::apache::vhosts:
     ip: 77.74.237.37
     port: 443
     ssl: true
-    ssl_cert: /etc/pki/tls/certs/portal.esysta.com-cert.pem
-    ssl_chain: /etc/pki/tls/certs/portal.esysta.com-cert.pem
-    ssl_key: /etc/pki/tls/private/portal.esysta.com-key.pem
+    cert_servername: 'esysta.com'
+    cert_customer: 'emperra'
+    ssl_cert: /etc/pki/tls/certs/esysta.com-cert.pem
+    ssl_chain: /etc/pki/tls/certs/esysta.com-cert.pem
+    ssl_key: /etc/pki/tls/private/esysta.com-key.pem
     directories:
       - directory_root:
         provider: directory
@@ -389,9 +391,11 @@ infra::profile::apache::vhosts:
     ip: 77.74.237.36
     port: 443
     ssl: true
-    ssl_cert: /etc/pki/tls/certs/portal.esysta.com-cert.pem
-    ssl_chain: /etc/pki/tls/certs/portal.esysta.com-cert.pem
-    ssl_key: /etc/pki/tls/private/portal.esysta.com-key.pem
+    cert_servername: 'esysta.com'
+    cert_customer: 'emperra'
+    ssl_cert: /etc/pki/tls/certs/esysta.com-cert.pem
+    ssl_chain: /etc/pki/tls/certs/esysta.com-cert.pem
+    ssl_key: /etc/pki/tls/private/esysta.com-key.pem
     directories:
       - directory_root:
         provider: directory
@@ -461,9 +465,11 @@ infra::profile::apache::vhosts:
     ip: 77.74.237.38
     port: 443
     ssl: true
-    ssl_cert: /etc/pki/tls/certs/portal.esysta.com-cert.pem
-    ssl_chain: /etc/pki/tls/certs/portal.esysta.com-cert.pem
-    ssl_key: /etc/pki/tls/private/portal.esysta.com-key.pem
+    cert_servername: 'esysta.com'
+    cert_customer: 'emperra'
+    ssl_cert: /etc/pki/tls/certs/esysta.com-cert.pem
+    ssl_chain: /etc/pki/tls/certs/esysta.com-cert.pem
+    ssl_key: /etc/pki/tls/private/esysta.com-key.pem
     directories:
       - directory_root:
         provider: directory

diff --git a/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml b/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml
index 2748829e9fdd6981c80a7f041e218fb0d5efa917..5f03fd2cdf37a9d9617d1c8e296abdfe7081e02e 100644 (file)
--- a/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml
+++ b/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml
@@ -200,6 +200,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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
@@ -242,6 +244,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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
@@ -285,6 +289,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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
@@ -328,6 +334,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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
@@ -386,6 +394,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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
@@ -443,6 +453,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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
@@ -502,6 +514,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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
@@ -544,6 +558,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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
@@ -585,6 +601,8 @@ infra::profile::apache::vhosts:
     ip: 77.74.238.70
     port: 443
     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

diff --git a/customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml b/customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml
index c1018a2ac6c00e4a6b11e5f095ece7e2d30dbe60..8780e8f7a4ca856d1e38d0c687eab8ce232313c3 100644 (file)
--- a/customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml
+++ b/customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml
@@ -29,9 +29,11 @@ infra::profile::wordpress::projects:
     servername: www.emperra.com
     docroot: '/var/www/emperra'
     ip: 217.66.54.228
-    ssl_cert: '/etc/ssl/certs/www.emperra.com.cert'
-    ssl_key: '/etc/pki/tls/private/www.emperra.com.key'
-    ssl_chain: '/etc/ssl/certs/www.emperra.com.cert'
+    cert_servername: 'www.emperra.com'
+    cert_customer: 'emperra'
+    ssl_cert: '/etc/ssl/certs/www.emperra.com-cert.pem'
+    ssl_key: '/etc/pki/tls/private/www.emperra.com-key.pem'
+    ssl_chain: '/etc/ssl/certs/www.emperra.com-cert.pem'
     user: 'apache'
     group: 'apache'
     mode: '2775'