This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1593
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1593 by this push:
     new 2065963  [DLAB-1593]: changed sans for step ca in case domain name is 
specified
2065963 is described below

commit 2065963e0398458c20e7b4948f6ba5bcbbb92738
Author: leonidfrolov <[email protected]>
AuthorDate: Wed Mar 11 13:53:46 2020 +0200

    [DLAB-1593]: changed sans for step ca in case domain name is specified
---
 infrastructure-provisioning/src/general/scripts/aws/edge_configure.py   | 2 ++
 infrastructure-provisioning/src/general/scripts/azure/edge_configure.py | 2 ++
 infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py   | 2 ++
 3 files changed, 6 insertions(+)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 52467aa..fe22ba1 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -91,6 +91,8 @@ if __name__ == "__main__":
     if os.environ['conf_stepcerts_enabled'] == 'true':
         step_cert_sans = ' --san {0} '.format(edge_conf['edge_private_ip'])
         if edge_conf['network_type'] == 'public':
+            if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' 
in os.environ:
+                step_cert_sans += ' --san 
{}.{}'.format(edge_conf['project_name'], os.environ['conf_domain_name'])
             step_cert_sans += ' --san {0} --san {1}'.format(
                 get_instance_hostname(edge_conf['tag_name'], 
edge_conf['instance_name']),
                 edge_conf['edge_public_ip'])
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index f41a1d9..9cb6130 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -99,6 +99,8 @@ if __name__ == "__main__":
             step_cert_sans = ' --san {0} --san {1} 
'.format(AzureMeta().get_private_ip_address(
                 edge_conf['resource_group_name'], edge_conf['instance_name']), 
edge_conf['instance_dns_name'])
             if os.environ['conf_network_type'] == 'public':
+                if os.environ['conf_domain_name_enabled'] and 
'conf_domain_name' in os.environ:
+                    step_cert_sans += ' --san 
{}.{}'.format(edge_conf['project_name'], os.environ['conf_domain_name'])
                 step_cert_sans += ' --san {0}'.format(
                     
AzureMeta().get_instance_public_ip_address(edge_conf['resource_group_name'],
                                                                
edge_conf['instance_name']))
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index b11e6e6..ecbb2fa 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -98,6 +98,8 @@ if __name__ == "__main__":
     if os.environ['conf_stepcerts_enabled'] == 'true':
         step_cert_sans = ' --san {0} --san {1} --san 
{2}'.format(edge_conf['static_ip'], instance_hostname,
                                                                  
edge_conf['private_ip'])
+        if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+            step_cert_sans += ' --san {}.{}'.format(edge_conf['project_name'], 
os.environ['conf_domain_name'])
     else:
         step_cert_sans = ''
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to