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 33e967e [DLAB-1594]: changed where nginx is configured
33e967e is described below
commit 33e967e857b1cdccbf73c5d6a5aa8cf0c415d119
Author: leonidfrolov <[email protected]>
AuthorDate: Mon Aug 3 20:18:05 2020 +0300
[DLAB-1594]: changed where nginx is configured
---
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index c4e337a..c4d5269 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -242,7 +242,6 @@ def configure_ssl_certs(hostname, custom_ssl_cert):
run_certbot(os.environ['conf_letsencrypt_domain_name'],
os.environ['conf_letsencrypt_email'])
else:
run_certbot(os.environ['conf_letsencrypt_domain_name'])
- 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))
@@ -306,6 +305,9 @@ if __name__ == "__main__":
print("Configuring nginx.")
configure_nginx(deeper_config, args.dlab_path, args.hostname)
+ print("Configuring nginx letsencrypt certificates.")
+ configure_nginx_LE(os.environ['conf_letsencrypt_domain_name'])
+
#print("Installing jenkins.")
#ensure_jenkins(args.dlab_path)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
