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/11/11 09:49:24 UTC
[incubator-dlab] branch DLAB-1158 updated: fixed issue with
accessing response files
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 8c2c6ff fixed issue with accessing response files
8c2c6ff is described below
commit 8c2c6ffc7b70e04cc3b177f230291f6e3a039dd5
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Nov 11 11:49:10 2019 +0200
fixed issue with accessing response files
---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 4 ++++
infrastructure-provisioning/terraform/bin/deploy/provisioning.yml | 2 +-
infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 2fbc43e..3dc30e5 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -297,6 +297,10 @@ def configure_supervisor_endpoint(endpoint_keystore_password):
cloud_properties = [
{
+ 'key': "OS_USER",
+ 'value': args.os_user
+ },
+ {
'key': "KEYNAME",
'value': args.key_name
},
diff --git a/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml b/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
index 7842080..4c07e5d 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
+++ b/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
@@ -20,7 +20,7 @@
# ******************************************************************************
<#assign LOG_ROOT_DIR="/var/opt/dlab/log">
-<#assign KEYS_DIR="/home/${sys['user.name']}/keys">
+<#assign KEYS_DIR="/home/OS_USER/keys">
<#assign KEY_STORE_PATH="${KEYS_DIR}/endpoint.keystore.jks">
<#assign KEY_STORE_PASSWORD="KEYSTORE_PASSWORD">
<#assign TRUST_STORE_PATH="JRE_HOME/lib/security/cacerts">
diff --git a/infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf b/infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf
index 7bb19b2..ae7b87f 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf
+++ b/infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf
@@ -29,7 +29,7 @@ command=java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 WEB_APP_DI
directory=WEB_APP_DIR
autorestart=true
priority=20
-user=OS_USR
+user=root
stdout_logfile=/var/log/application/provision-service.log
redirect_stderr=true
environment=DLAB_CONF_DIR="WEB_CONF"
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org