You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by my...@apache.org on 2020/06/19 07:47:01 UTC

[incubator-dlab] branch DLAB-515 updated: [DLAB-515] - GPG key renewal changed

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 a45445c  [DLAB-515] - GPG key renewal changed
     new 2f3ec2e  Merge remote-tracking branch 'origin/DLAB-515' into DLAB-515
a45445c is described below

commit a45445c919f4285cba61f8def2e3d688e6f004cb
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Fri Jun 19 10:46:11 2020 +0300

    [DLAB-515] - GPG key renewal changed
---
 infrastructure-provisioning/src/general/lib/os/debian/common_lib.py   | 4 ++--
 infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 4 ++--
 2 files changed, 4 insertions(+), 4 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 0c96260..a92b2bb 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -103,8 +103,8 @@ def ensure_pkg(user, requisites='linux-headers-generic python-pip python-dev '
 
 def renew_gpg_key():
     try:
-        if exists('/etc/apt/trusted.gpg'):
-            sudo('mv /etc/apt/trusted.gpg /etc/apt/trusted.bkp')
+#        if exists('/etc/apt/trusted.gpg'):
+#            sudo('mv /etc/apt/trusted.gpg /etc/apt/trusted.bkp')
         sudo('apt-key update')
     except:
         sys.exit(1)
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 b74146a..4e1efe1 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -49,8 +49,8 @@ def enable_proxy(proxy_host, proxy_port):
         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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org