You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/09/15 14:19:02 UTC
[incubator-dlab] branch DLAB-2052 created (now 1555bbf)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-2052
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 1555bbf [DLAB-2052]: fixed rstudio-server.service path
This branch includes the following new commits:
new c6c1838 [DLAB-2052]: fixed rstudio download link
new 1555bbf [DLAB-2052]: fixed rstudio-server.service path
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-2052]: fixed rstudio-server.service
path
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-2052
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1555bbfdbd0d683138217e5ebf8dbbf2836201f7
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Sep 15 15:53:20 2020 +0300
[DLAB-2052]: fixed rstudio-server.service path
---
.../src/general/lib/os/debian/notebook_lib.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 586ca8c..ea1bfd5 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -125,17 +125,17 @@ def install_rstudio(os_user, local_spark_path, rstudio_pass, rstudio_version):
sudo('chown {0}:{0} /mnt/var'.format(os_user))
http_proxy = run('echo $http_proxy')
https_proxy = run('echo $https_proxy')
- sudo("sed -i '/Type=forking/a \Environment=USER=dlab-user' /lib/systemd/system/rstudio-server.service")
- sudo("sed -i '/ExecStart/s|=/usr/lib/rstudio-server/bin/rserver|=/bin/bash -c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; /usr/lib/rstudio-server/bin/rserver --auth-none 1|g' /lib/systemd/system/rstudio-server.service")
- sudo("sed -i '/ExecStart/s|$|\"|g' /lib/systemd/system/rstudio-server.service")
+ sudo("sed -i '/Type=forking/a \Environment=USER=dlab-user' /etc/systemd/system/rstudio-server.service")
+ sudo("sed -i '/ExecStart/s|=/usr/lib/rstudio-server/bin/rserver|=/bin/bash -c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; /usr/lib/rstudio-server/bin/rserver --auth-none 1|g' /etc/systemd/system/rstudio-server.service")
+ sudo("sed -i '/ExecStart/s|$|\"|g' /etc/systemd/system/rstudio-server.service")
sudo(
- 'sed -i \'/\[Service\]/a Environment=\"HTTP_PROXY={}\"\' /lib/systemd/system/rstudio-server.service'.format(
+ 'sed -i \'/\[Service\]/a Environment=\"HTTP_PROXY={}\"\' /etc/systemd/system/rstudio-server.service'.format(
http_proxy))
sudo(
- 'sed -i \'/\[Service\]/a Environment=\"HTTPS_PROXY={}\"\' /lib/systemd/system/rstudio-server.service'.format(
+ 'sed -i \'/\[Service\]/a Environment=\"HTTPS_PROXY={}\"\' /etc/systemd/system/rstudio-server.service'.format(
https_proxy))
java_home = run("update-alternatives --query java | grep -o \'/.*/java-8.*/jre\'").splitlines()[0]
- sudo('sed -i \'/\[Service\]/ a\Environment=\"JAVA_HOME={}\"\' /lib/systemd/system/rstudio-server.service'.format(
+ sudo('sed -i \'/\[Service\]/ a\Environment=\"JAVA_HOME={}\"\' /etc/systemd/system/rstudio-server.service'.format(
java_home))
sudo("systemctl daemon-reload")
sudo('touch /home/{}/.Renviron'.format(os_user))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-2052]: fixed rstudio download link
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-2052
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c6c183853c2575b332c7015623baa1cf4f5b9285
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Sep 15 14:50:23 2020 +0300
[DLAB-2052]: fixed rstudio download link
---
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 819bcd7..586ca8c 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -119,7 +119,7 @@ def install_rstudio(os_user, local_spark_path, rstudio_pass, rstudio_version):
try:
manage_pkg('-y install', 'remote', 'r-base')
manage_pkg('-y install', 'remote', 'gdebi-core')
- sudo('wget https://download2.rstudio.org/server/xenial/amd64/rstudio-server-{}-amd64.deb'.format(rstudio_version))
+ sudo('wget https://download2.rstudio.org/server/trusty/amd64/rstudio-server-{}-amd64.deb'.format(rstudio_version))
sudo('gdebi -n rstudio-server-{}-amd64.deb'.format(rstudio_version))
sudo('mkdir -p /mnt/var')
sudo('chown {0}:{0} /mnt/var'.format(os_user))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org