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/14 09:43:23 UTC
[incubator-dlab] branch redhat-fix-rc22 created (now 6686c8d)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch redhat-fix-rc22
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 6686c8d Fixed issue with supervisor conf file;
This branch includes the following new commits:
new 6686c8d Fixed issue with supervisor conf file;
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Fixed issue with supervisor conf file;
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch redhat-fix-rc22
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6686c8dff45bbb32937931d7a8731207cb97ff6b
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Nov 14 11:43:08 2019 +0200
Fixed issue with supervisor conf file;
---
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
index 976fa80..5fe41d1 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -206,7 +206,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
try:
if not exists('{}tmp/ss_started'.format(os.environ['ssn_dlab_path'])):
java_path = sudo("alternatives --display java | grep 'slave jre: ' | awk '{print $3}'")
- supervisor_conf = '/etc/supervisord.d/supervisor_svc.ini'
+ supervisor_conf = '/etc/supervisord.d/supervisor_svc.conf'
local('sed -i "s|MONGO_PASSWORD|{}|g" /root/templates/ssn.yml'.format(mongo_passwd))
local('sed -i "s|KEYSTORE_PASSWORD|{}|g" /root/templates/ssn.yml'.format(keystore_passwd))
local('sed -i "s|CLOUD_PROVIDER|{}|g" /root/templates/ssn.yml'.format(cloud_provider))
@@ -233,11 +233,11 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
.replace('CONF_PARAMETER_NAME', conf_parameter_name)
with open('/root/templates/supervisor_svc.conf', 'w') as f:
f.write(text)
- put('/root/templates/supervisor_svc.ini', '/tmp/supervisor_svc.ini')
- sudo('mv /tmp/supervisor_svc.ini ' + os.environ['ssn_dlab_path'] + 'tmp/')
+ put('/root/templates/supervisor_svc.conf', '/tmp/supervisor_svc.conf')
+ sudo('mv /tmp/supervisor_svc.conf ' + os.environ['ssn_dlab_path'] + 'tmp/')
sudo('cp ' + os.environ['ssn_dlab_path'] +
'tmp/proxy_location_webapp_template.conf /etc/nginx/locations/proxy_location_webapp.conf')
- sudo('cp ' + os.environ['ssn_dlab_path'] + 'tmp/supervisor_svc.ini {}'.format(supervisor_conf))
+ sudo('cp ' + os.environ['ssn_dlab_path'] + 'tmp/supervisor_svc.conf {}'.format(supervisor_conf))
sudo('sed -i \'s=WEB_APP_DIR={}=\' {}'.format(web_path, supervisor_conf))
try:
sudo('mkdir -p /var/log/application')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org