[incubator-dlab] branch DLAB-515 updated: [DLAB-515]: fixed issue with Ubuntu version change

[om...@apache.org]

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

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


The following commit(s) were added to refs/heads/DLAB-515 by this push:
     new 7415f61  [DLAB-515]: fixed issue with Ubuntu version change
7415f61 is described below

commit 7415f61b261883e0f2ce92dc5d8cfd36d38be030
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Apr 2 11:15:24 2020 +0300

    [DLAB-515]: fixed issue with Ubuntu version change
---
 infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 06ba99a..add996d 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
@@ -51,8 +51,8 @@ def configure_http_proxy_server(config):
             for cidr in config['allowed_ip_cidr']:
                 replace_string += 'acl AllowedCIDRS src {}\\n'.format(cidr)
             sudo('sed -i "s|ALLOWED_CIDRS|{}|g" /etc/squid/squid.conf'.format(replace_string))
-            sudo('systemctl reload squid')
-            sudo('systemctl enable squid')
+            sudo('service squid reload')
+            sudo('sysv-rc-conf squid on')
             sudo('touch /tmp/http_proxy_ensured')
     except Exception as err:
         print("Failed to install and configure squid: " + str(err))
@@ -188,7 +188,7 @@ def install_nginx_lua(edge_ip, nginx_version, keycloak_auth_server_url, keycloak
             sudo('chmod +x /etc/init.d/nginx')
             sudo('systemctl daemon-reload')
             sudo('systemctl enable nginx')
-            sudo('/etc/init.d/nginx start')
+            sudo('systemctl start nginx')
             sudo('touch /tmp/nginx_installed')
     except Exception as err:
         print("Failed install nginx with ldap: " + str(err))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org