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/03/10 13:59:33 UTC
[incubator-dlab] 01/04: [DLAB-1593]: added ensure_dir in case
domain name has been used during nginx configuration
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1593
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6e65739585aed4a77446f4ca6d897597456a957d
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Mar 10 13:28:40 2020 +0200
[DLAB-1593]: added ensure_dir in case domain name has been used during nginx configuration
---
infrastructure-provisioning/src/general/scripts/aws/edge_configure.py | 1 +
infrastructure-provisioning/src/general/scripts/azure/edge_configure.py | 1 +
infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py | 1 +
.../src/project/scripts/configure_nginx_reverse_proxy.py | 1 +
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 1 +
5 files changed, 5 insertions(+)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 9edb802..012fb20 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -222,6 +222,7 @@ if __name__ == "__main__":
raise Exception
if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
hostname_param = "--hostname {}.{}".format(os.environ['project_name'], os.environ['conf_domain_name'])
+ local('touch /home/' + os_user + '/.ensure_dir/domain_name_ensured')
else:
hostname_param = ''
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index eeddbfd..80e5a44 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -293,6 +293,7 @@ if __name__ == "__main__":
raise Exception
if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
hostname_param = "--hostname {}.{}".format(os.environ['project_name'], os.environ['conf_domain_name'])
+ local('touch /home/' + os_user + '/.ensure_dir/domain_name_ensured')
else:
hostname_param = ''
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index c25fc4c..00d8885 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -264,6 +264,7 @@ if __name__ == "__main__":
raise Exception
if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
hostname_param = "--hostname {}.{}".format(os.environ['project_name'], os.environ['conf_domain_name'])
+ local('touch /home/' + os_user + '/.ensure_dir/domain_name_ensured')
else:
hostname_param = ''
keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
diff --git a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
index 786ea43..dd73bbd 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
@@ -65,6 +65,7 @@ if __name__ == "__main__":
try:
if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
args.hostname = "{}.{}".format(os.environ['project_name'], os.environ['conf_domain_name'])
+ local('touch /home/' + os_user + '/.ensure_dir/domain_name_ensured')
install_nginx_lua(args.hostname, os.environ['reverse_proxy_nginx_version'],
os.environ['keycloak_auth_server_url'], os.environ['keycloak_realm_name'],
args.keycloak_client_id, args.keycloak_client_secret, args.user, args.hostname,
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index fb22bbe..ef6df09 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -233,6 +233,7 @@ if __name__ == "__main__":
if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
args.hostname = "ssn.{}".format(os.environ['conf_domain_name'])
+ local('touch /home/' + os_user + '/.ensure_dir/domain_name_ensured')
print("Installing nginx as frontend.")
ensure_nginx(args.dlab_path)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org