This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch epm-2.5-preview1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/epm-2.5-preview1 by this push:
new 63b20f5 [epm-2.5-preview1] - Certbot install fixed
63b20f5 is described below
commit 63b20f50f1ea7594bf1a3368cf200db57b2acf83
Author: bodnarmykola <[email protected]>
AuthorDate: Fri May 7 10:03:44 2021 +0300
[epm-2.5-preview1] - Certbot install fixed
---
infrastructure-provisioning/src/general/lib/os/debian/common_lib.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 d835825..29b504b 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -246,8 +246,8 @@ def configure_nginx_LE(domain_name, node):
server_name_line =' server_name {}.{};'.format(node, domain_name)
cert_path_line = ' ssl_certificate
/etc/letsencrypt/live/{}.{}/fullchain.pem;'.format(node, domain_name)
cert_key_line = ' ssl_certificate_key
/etc/letsencrypt/live/{}.{}/privkey.pem;'.format(node, domain_name)
- certbot_service = "ExecStart = /usr/bin/certbot -q renew --pre-hook
'service nginx stop' --post-hook 'service nginx start'"
- certbot_service_path = '/lib/systemd/system/certbot.service'
+ #certbot_service = "ExecStart = /usr/bin/certbot -q renew --pre-hook
'service nginx stop' --post-hook 'service nginx start'"
+ #certbot_service_path = '/lib/systemd/system/certbot.service'
if node == 'ssn':
nginx_config_path = '/etc/nginx/conf.d/nginx_proxy.conf'
else:
@@ -255,7 +255,7 @@ def configure_nginx_LE(domain_name, node):
datalab.fab.conn.sudo('sed -i "s|.* server_name .*|{}|"
{}'.format(server_name_line, nginx_config_path))
datalab.fab.conn.sudo('sed -i "s|.* ssl_certificate .*|{}|"
{}'.format(cert_path_line, nginx_config_path))
datalab.fab.conn.sudo('sed -i "s|.* ssl_certificate_key .*|{}|"
{}'.format(cert_key_line, nginx_config_path))
- datalab.fab.conn.sudo('sed -i "s|.*ExecStart.*|{}|"
{}'.format(certbot_service, certbot_service_path))
+ #datalab.fab.conn.sudo('sed -i "s|.*ExecStart.*|{}|"
{}'.format(certbot_service, certbot_service_path))
if node == 'ssn':
datalab.fab.conn.sudo('systemctl restart nginx')
else:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
