This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1594-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1594-2 by this push:
new ecef631 [DLAB-1594]: changed some arguments
ecef631 is described below
commit ecef631c5f0655c13dfaa495af67515d623197d7
Author: leonidfrolov <[email protected]>
AuthorDate: Mon Aug 3 19:33:43 2020 +0300
[DLAB-1594]: changed some arguments
---
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 3663b97..eb0445a 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -137,7 +137,7 @@ def install_certbot(os_family):
print('Failed Certbot install: ' + str(err))
sys.exit(1)
-def run_certbot(domain_name, email):
+def run_certbot(domain_name, email=''):
try:
print('Running Certbot')
sudo('service nginx stop')
@@ -238,8 +238,8 @@ def configure_ssl_certs(hostname, custom_ssl_cert):
sudo('systemctl enable step-cert-manager.service')
elif os.environ['conf_letsencrypt_enabled'] == 'true':
install_certbot(os.environ['conf_os_family'])
- run_certbot(cloud_params['LETS_ENCRYPT_DOMAIN_NAME'],
cloud_params['LETS_ENCRYPT_EMAIL'])
- configure_nginx_LE(cloud_params['LETS_ENCRYPT_DOMAIN_NAME'])
+ run_certbot(os.environ['conf_letsencrypt_domain_name'],
os.environ['conf_letsencrypt_email'])
+ configure_nginx_LE(os.environ['conf_letsencrypt_domain_name'])
else:
sudo('openssl req -x509 -nodes -days 3650 -newkey rsa:2048
-keyout /etc/ssl/certs/dlab.key \
-out /etc/ssl/certs/dlab.crt -subj
"/C=US/ST=US/L=US/O=dlab/CN={}"'.format(hostname))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
