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
commit 4e8eae28d61b9827687923126d3e30e3e5030d8f Author: leonidfrolov <[email protected]> AuthorDate: Tue Feb 25 12:44:52 2020 +0200 DLAB-1517 added usage of ssn_nginx.conf file --- infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 3 +++ 1 file changed, 3 insertions(+) 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 814421e..84c94e9 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py @@ -106,9 +106,12 @@ def configure_nginx(config, dlab_path, hostname): random_file_part = id_generator(size=20) if not exists("/etc/nginx/conf.d/nginx_proxy.conf"): sudo('rm -f /etc/nginx/conf.d/*') + put(config['nginx_template_dir'] + 'ssn_nginx.conf', '/tmp/ssn_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_proxy.conf ' + dlab_path + 'tmp/') + sudo('\cp ' + dlab_path + 'tmp/ssn_nginx.conf /etc/nginx/conf.d/') 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: [email protected] For additional commands, e-mail: [email protected]
