This is an automated email from the ASF dual-hosted git repository.
mykolabodnar 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 a6ebe55 [DLAB-515] - GPG update disabled/HTTPS proxy for apt added
a6ebe55 is described below
commit a6ebe552d0d73189f0df4e786b57e4aa56ef3b99
Author: bodnarmykola <bodnarmyk...@gmail.com>
AuthorDate: Thu Jun 18 09:55:55 2020 +0300
[DLAB-515] - GPG update disabled/HTTPS proxy for apt added
---
.../src/general/lib/os/debian/notebook_lib.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index 0daca32..b74146a 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -39,6 +39,7 @@ import re
def enable_proxy(proxy_host, proxy_port):
try:
proxy_string = "http://%s:%s"; % (proxy_host, proxy_port)
+ proxy_https_string = "http://%s:%s"; % (proxy_host, proxy_port)
sudo('sed -i "/^export http_proxy/d" /etc/profile')
sudo('sed -i "/^export https_proxy/d" /etc/profile')
sudo('echo export http_proxy=' + proxy_string + ' >> /etc/profile')
@@ -46,9 +47,10 @@ def enable_proxy(proxy_host, proxy_port):
if exists('/etc/apt/apt.conf'):
sudo("sed -i '/^Acquire::http::Proxy/d' /etc/apt/apt.conf")
sudo("echo 'Acquire::http::Proxy \"" + proxy_string + "\";' >>
/etc/apt/apt.conf")
+ sudo("echo 'Acquire::http::Proxy \"" + proxy_https_string + "\";' >>
/etc/apt/apt.conf")
- print("Renewing gpg key")
- renew_gpg_key()
+ #print("Renewing gpg key")
+ #renew_gpg_key()
except:
sys.exit(1)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
