[DLAB-2003]: fixed failure when stopping nginx
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index 296d9ab..414516f 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -185,7 +185,10 @@
def run_certbot(domain_name, node, email=''):
try:
print('Running Certbot')
- sudo('service nginx stop')
+ if node == 'ssn':
+ sudo('service nginx stop')
+ else:
+ sudo('service openresty stop')
if email != '':
sudo('certbot certonly --standalone -n -d {}.{} -m {}'.format(node, domain_name, email))
else:
@@ -205,12 +208,15 @@
if node == 'ssn':
nginx_config_path = '/etc/nginx/conf.d/nginx_proxy.conf'
else:
- nginx_config_path = '/etc/nginx/conf.d/proxy.conf'
+ nginx_config_path = '/usr/local/openresty/nginx/conf/conf.d/proxy.conf'
sudo('sed -i "s|.* server_name .*|{}|" {}'.format(server_name_line, nginx_config_path))
sudo('sed -i "s|.* ssl_certificate .*|{}|" {}'.format(cert_path_line, nginx_config_path))
sudo('sed -i "s|.* ssl_certificate_key .*|{}|" {}'.format(cert_key_line, nginx_config_path))
sudo('sed -i "s|.*ExecStart.*|{}|" {}'.format(certbot_service, certbot_service_path))
- sudo('systemctl restart nginx')
+ if node == 'ssn':
+ sudo('systemctl restart nginx')
+ else:
+ sudo('systemctl restart openresty')
except Exception as err:
traceback.print_exc()
print('Failed to run Certbot: ' + str(err))
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
index 836fd64..bead225 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
@@ -156,9 +156,9 @@
print("Configuring letsencrypt certificates.")
install_certbot(os.environ['conf_os_family'])
if 'conf_letsencrypt_email' in os.environ:
- run_certbot(os.environ['conf_letsencrypt_domain_name'], os.environ['project_name'], os.environ['conf_letsencrypt_email'])
+ run_certbot(os.environ['conf_letsencrypt_domain_name'], os.environ['project_name'].lower(), os.environ['conf_letsencrypt_email'])
else:
- run_certbot(os.environ['conf_letsencrypt_domain_name'], os.environ['project_name'])
+ run_certbot(os.environ['conf_letsencrypt_domain_name'], os.environ['project_name'].lower())
configure_nginx_LE(os.environ['conf_letsencrypt_domain_name'], os.environ['project_name'])
except Exception as err:
print("Failed install nginx with ldap: " + str(err))
