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

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


The following commit(s) were added to refs/heads/DLAB-37 by this push:
     new 65aab78  [DLAB-37]: SSO supporting for RedHat fixed
65aab78 is described below

commit 65aab7866804db200faffa702588dda250c2413c
Author: Mykola_Bodnar1 <[email protected]>
AuthorDate: Fri Feb 21 11:59:32 2020 +0200

    [DLAB-37]: SSO supporting for RedHat fixed
---
 infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py   | 6 +++---
 .../src/general/lib/os/redhat/notebook_lib.py                       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py 
b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py
index 966bae2..8dde808 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/edge_lib.py
@@ -137,8 +137,8 @@ def install_nginx_lua(edge_ip, nginx_version, 
keycloak_auth_server_url, keycloak
                 sudo('make')
                 sudo('make install')
 
-            with cd('/tmp/src/nginx/'), 
shell_env(LUAJIT_LIB='/usr/local/lib/', 
LUAJIT_INC='/usr/local/include/luajit-2.0')::
-            sudo('./configure --user=nginx --group=nginx --prefix=/etc/nginx 
--sbin-path=/usr/sbin/nginx \
+            with cd('/tmp/src/nginx/'), 
shell_env(LUAJIT_LIB='/usr/local/lib/', 
LUAJIT_INC='/usr/local/include/luajit-2.0'):
+                sudo('./configure --user=nginx --group=nginx 
--prefix=/etc/nginx --sbin-path=/usr/sbin/nginx \
                                               
--conf-path=/etc/nginx/nginx.conf --pid-path=/run/nginx.pid 
--lock-path=/run/lock/subsys/nginx \
                                               
--error-log-path=/var/log/nginx/error.log 
--http-log-path=/var/log/nginx/access.log \
                                               --with-http_gzip_static_module 
--with-http_stub_status_module --with-http_ssl_module --with-pcre \
@@ -149,7 +149,7 @@ def install_nginx_lua(edge_ip, nginx_version, 
keycloak_auth_server_url, keycloak
                 sudo('make install')
 
             with cd('/tmp/src/luarocks-2.2.2/'):
-                sudo('./configure')
+                sudo('./configure 
--with-lua-include=/usr/local/include/luajit-2.0')
                 sudo('make build')
                 sudo('make install')
                 sudo('luarocks install lua-resty-jwt')
diff --git 
a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py 
b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
index e39ed00..34bae34 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py
@@ -90,7 +90,7 @@ def ensure_r(os_user, r_libs, region, r_mirror):
             else:
                 r_repository = 'https://cloud.r-project.org'
             manage_pkg('-y install', 'remote', 'cmake')
-            manage_pkg('-y install', 'remote', 'libcur')
+            manage_pkg('-y install', 'remote', 'libcur*')
             sudo('echo -e 
"[base]\nname=CentOS-7-Base\nbaseurl=http://buildlogs.centos.org/centos/7/os/x86_64-20140704-1/\ngpgcheck=1\ngpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7\npriority=1\nexclude=php
 mysql" >> /etc/yum.repos.d/CentOS-base.repo')
             manage_pkg('-y install', 'remote', 'R R-core R-core-devel R-devel 
--nogpgcheck')
             sudo('R CMD javareconf')


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to