You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by ol...@apache.org on 2022/02/21 11:33:06 UTC
[incubator-datalab] branch 2.5.1-tensor-jupyterlab updated: config file location fix'
This is an automated email from the ASF dual-hosted git repository.
olehmykolaishyn pushed a commit to branch 2.5.1-tensor-jupyterlab
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/2.5.1-tensor-jupyterlab by this push:
new 259a222 config file location fix'
259a222 is described below
commit 259a2221910a4fdf03f84cb71857bfbf526684de
Author: oleh_mykolaishyn <ow...@gmail.com>
AuthorDate: Mon Feb 21 13:32:51 2022 +0200
config file location fix'
---
infrastructure-provisioning/src/general/lib/os/fab.py | 15 +--------------
.../scripts/configure_tensor-jupyterlab_node.py | 2 +-
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 9bf7449..52f880b 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -1061,25 +1061,12 @@ def configure_jupyterlab(os_user, jupyterlab_conf_file, templates_dir, jupyterla
java_home = conn.run("update-alternatives --query java | grep -o --color=never \'/.*/java-11.*/bin/java\'").stdout.splitlines()[0]
else:
java_home = conn.run("update-alternatives --query java | grep -o --color=never \'/.*/java-8.*/jre\'").stdout.splitlines()[0]
- conn.sudo('sed -i \'/\[Service\]/ a\Environment=\"JAVA_HOME={}\"\' /tmp/jupyterlab-notebook.service'.format(
- java_home))
- conn.sudo('\cp /tmp/jupyterlab-notebook.service /etc/systemd/system/jupyterlab-notebook.service')
- conn.sudo('chown -R {0}:{0} /home/{0}/.local'.format(os_user))
- conn.sudo('mkdir -p /mnt/var')
- conn.sudo('chown {0}:{0} /mnt/var'.format(os_user))
- conn.sudo("systemctl daemon-reload")
- conn.sudo("systemctl enable jupyterlab-notebook")
- conn.sudo("systemctl start jupyterlab-notebook")
- conn.sudo('touch /home/{}/.ensure_dir/jupyterlab_ensured'.format(os_user))
- #conn.sudo('sed -i \'/\[Service\]/ a\Environment=\"JAVA_HOME={}\"\' /tmp/jupyterlab-notebook.service'.format(
+ # conn.sudo('sed -i \'/\[Service\]/ a\Environment=\"JAVA_HOME={}\"\' /tmp/jupyterlab-notebook.service'.format(
# java_home))
conn.sudo('cp /tmp/jupyterlab-notebook.service /etc/systemd/system/jupyterlab-notebook.service')
conn.sudo("systemctl daemon-reload")
conn.sudo("systemctl enable jupyterlab-notebook")
conn.sudo("systemctl start jupyterlab-notebook")
- #conn.sudo('chown -R {0}:{0} /home/{0}/.local'.format(os_user))
- #conn.sudo('mkdir -p /mnt/var')
- #conn.sudo('chown {0}:{0} /mnt/var'.format(os_user))
conn.sudo('touch /home/{}/.ensure_dir/jupyterlab_ensured'.format(os_user))
except Exception as err:
logging.error('Function configure_jupyterlab error:', str(err))
diff --git a/infrastructure-provisioning/src/tensor-jupyterlab/scripts/configure_tensor-jupyterlab_node.py b/infrastructure-provisioning/src/tensor-jupyterlab/scripts/configure_tensor-jupyterlab_node.py
index 1b14876..7f2a829 100644
--- a/infrastructure-provisioning/src/tensor-jupyterlab/scripts/configure_tensor-jupyterlab_node.py
+++ b/infrastructure-provisioning/src/tensor-jupyterlab/scripts/configure_tensor-jupyterlab_node.py
@@ -63,7 +63,7 @@ local_spark_path = '/opt/spark/'
jars_dir = '/opt/jars/'
templates_dir = '/root/templates/'
files_dir = '/root/files/'
-jupyterlab_conf_file = '/home/' + args.os_user + '/.jupyter/jupyter_notebook_config.py'
+jupyterlab_conf_file = '/home/' + args.os_user + '/.jupyter/jupyter_lab_config.py'
#
gitlab_certfile = os.environ['conf_gitlab_certfile']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org