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/02/26 10:47:27 UTC
[incubator-dlab] branch DLAB-1517 updated: DLAB-1517 changed cp
path for nginx.conf
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1517
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1517 by this push:
new 2239cca DLAB-1517 changed cp path for nginx.conf
2239cca is described below
commit 2239cca509f21ff4bc0bb123317dcb29fe93d2dd
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Feb 26 12:47:10 2020 +0200
DLAB-1517 changed cp path for nginx.conf
---
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index 8778f54..bb073c3 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -107,12 +107,12 @@ def configure_nginx(config, dlab_path, hostname):
if not exists("/etc/nginx/conf.d/nginx_proxy.conf"):
sudo('useradd -r nginx')
sudo('rm -f /etc/nginx/conf.d/*')
- put(config['nginx_template_dir'] + 'ssn_nginx.conf', '/tmp/ssn_nginx.conf')
+ put(config['nginx_template_dir'] + 'ssn_nginx.conf', '/tmp/nginx.conf')
put(config['nginx_template_dir'] + 'nginx_proxy.conf', '/tmp/nginx_proxy.conf')
sudo("sed -i 's|SSN_HOSTNAME|" + hostname + "|' /tmp/nginx_proxy.conf")
- sudo('mv /tmp/ssn_nginx.conf ' + dlab_path + 'tmp/')
+ sudo('mv /tmp/nginx.conf ' + dlab_path + 'tmp/')
sudo('mv /tmp/nginx_proxy.conf ' + dlab_path + 'tmp/')
- sudo('\cp ' + dlab_path + 'tmp/ssn_nginx.conf /etc/nginx/conf.d/')
+ sudo('\cp ' + dlab_path + 'tmp/nginx.conf /etc/nginx/')
sudo('\cp ' + dlab_path + 'tmp/nginx_proxy.conf /etc/nginx/conf.d/')
sudo('mkdir -p /etc/nginx/locations')
sudo('rm -f /etc/nginx/sites-enabled/default')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org