You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/02/19 10:34:17 UTC
[incubator-dlab] branch EPMCDLAB-1186 updated: fixed issue with IAM
user check
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch EPMCDLAB-1186
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/EPMCDLAB-1186 by this push:
new 7a560b2 fixed issue with IAM user check
7a560b2 is described below
commit 7a560b2c7720b6fa6275a3a31421c044c9c76130
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Feb 19 12:34:09 2019 +0200
fixed issue with IAM user check
---
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 3 +++
services/security-service/security.yml | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 7fddc89..e2f8bcf 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -171,6 +171,9 @@ def build_ui():
os.environ['local_repository_parent_proxy_host'], args.dlab_path))
sudo('sed -i "s/DLAB_PARENT_PROXY_PORT/{0}/g" {1}/webapp/self-service/conf/self-service.yml'.format(
os.environ['local_repository_parent_proxy_port'], args.dlab_path))
+ if 'local_repository_nginx_proxy_host' in os.environ:
+ sudo('sed -i "s/LOCAL_REPOSITORY_NGINX_PROXY_HOST/{0}/g" {1}/sources/services/security-service/'
+ 'security.yml'.format(os.environ['local_repository_nginx_proxy_host'], args.dlab_path))
sudo('sed -i "s/LDAP_HOST/{0}/g" {1}/sources/services/security-service/security.yml'.format(
os.environ['ldap_hostname'], args.dlab_path))
sudo('sed -i "s/LDAP_USER/{0}/g" {1}/sources/services/security-service/security.yml'.format(
diff --git a/services/security-service/security.yml b/services/security-service/security.yml
index 7707c26..b29aa47 100644
--- a/services/security-service/security.yml
+++ b/services/security-service/security.yml
@@ -150,8 +150,10 @@ userInfoPersistenceEnabled: true
<#if CLOUD_TYPE == "aws">
awsUserIdentificationEnabled: true
-awsUserIdentificationEndpoint: http://${REPOSITORY_HOST}/iam
+<#if DLAB_LOCAL_REPO == "true">
+awsUserIdentificationEndpoint: http://LOCAL_REPOSITORY_NGINX_PROXY_HOST/iam
awsUserIdentificationEndpointRegion: us-east-1
+</#if>
loginAuthenticationTimeout: 10
<#elseif CLOUD_TYPE == "azure">
loginAuthenticationTimeout: 20
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org