This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new 6c8d658 added step-ca
6c8d658 is described below
commit 6c8d658c56e0b990513e26e84a0557a9fc5ccad6
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Mon Dec 9 16:13:34 2019 +0200
added step-ca
---
.../src/general/lib/os/debian/edge_lib.py | 13 ++++++++-----
.../src/project/templates/conf.d/proxy.conf | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
index 48419e8..69c31b4 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
@@ -147,12 +147,15 @@ def install_nginx_lua(edge_ip, nginx_version,
keycloak_auth_server_url, keycloak
sudo('rm -f /etc/nginx/nginx.conf')
sudo('mkdir -p /opt/dlab/templates')
put('/root/templates', '/opt/dlab', use_sudo=True)
- keycloak_auth_server_ip =
''.join(re.findall('(?:[12]?\\d?\\d\\.){3}[12]?\\d?\\d:\d+',
keycloak_auth_server_url))
sudo('sed -i \'s/EDGE_IP/{}/g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(edge_ip))
- sudo('sed -i \'s/KEYCLOAK_SERVER_IP/{}/g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(keycloak_auth_server_ip))
- sudo('sed -i \'s/KEYCLOAK_REALM_NAME/{}/g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(keycloak_realm_name))
- sudo('sed -i \'s/KEYCLOAK_CLIENT_ID/{}/g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(keycloak_client_id))
- sudo('sed -i \'s/KEYCLOAK_CLIENT_SECRET/{}/g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(keycloak_client_secret))
+ sudo('sed -i \'s|KEYCLOAK_AUTH_URL|{}|g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(
+ keycloak_auth_server_url))
+ sudo('sed -i \'s/KEYCLOAK_REALM_NAME/{}/g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(
+ keycloak_realm_name))
+ sudo('sed -i \'s/KEYCLOAK_CLIENT_ID/{}/g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(
+ keycloak_client_id))
+ sudo('sed -i \'s/KEYCLOAK_CLIENT_SECRET/{}/g\'
/opt/dlab/templates/conf.d/proxy.conf'.format(
+ keycloak_client_secret))
sudo('cp /opt/dlab/templates/nginx.conf /etc/nginx/')
sudo('mkdir /etc/nginx/conf.d')
diff --git
a/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
b/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
index ba12164..b8a459b 100644
--- a/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
+++ b/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
@@ -66,7 +66,7 @@ server {
local opts = {
redirect_uri_path = "/*",
accept_none_alg = true,
- discovery =
"http://KEYCLOAK_SERVER_IP/auth/realms/KEYCLOAK_REALM_NAME/.well-known/openid-configuration";,
+ discovery =
"KEYCLOAK_AUTH_URL/realms/KEYCLOAK_REALM_NAME/.well-known/openid-configuration",
client_id = "KEYCLOAK_CLIENT_ID",
client_secret = "KEYCLOAK_CLIENT_SECRET",
ssl_verify = "no",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
