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/25 11:10:19 UTC
[incubator-dlab] branch DLAB-1517 updated (f033dda -> 1345909)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1517
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
discard f033dda DLAB-1517 changed max allowed http request size
new 4e8eae2 DLAB-1517 added usage of ssn_nginx.conf file
new 1345909 DLAB-1517 added nginx user creation
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f033dda)
\
N -- N -- N refs/heads/DLAB-1517 (1345909)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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.
Summary of changes:
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 4 ++++
infrastructure-provisioning/src/project/templates/conf.d/proxy.conf | 2 --
infrastructure-provisioning/src/project/templates/nginx.conf | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: DLAB-1517 added nginx user creation
Posted by lf...@apache.org.
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 1345909a850c8feebaa938ac27e1df2774a432b7
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Feb 25 12:57:18 2020 +0200
DLAB-1517 added nginx user creation
---
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 1 +
1 file changed, 1 insertion(+)
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 84c94e9..8778f54 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -105,6 +105,7 @@ def configure_nginx(config, dlab_path, hostname):
try:
random_file_part = id_generator(size=20)
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'] + 'nginx_proxy.conf', '/tmp/nginx_proxy.conf')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: DLAB-1517 added usage of ssn_nginx.conf file
Posted by lf...@apache.org.
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 <fr...@gmail.com>
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: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org