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/08/04 13:49:08 UTC

[incubator-dlab] branch DLAB-1594-2 updated (72ea0bb -> f2d35df)

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a change to branch DLAB-1594-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from 72ea0bb  [DLAB-1594]: changed how lines are replaced
     new 39c40f3  [DLAB-1594]: added ssn. to cert path
     new f2d35df  [DLAB-1594]: changed how lines are replaced

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/ssn/scripts/configure_ssn_node.py | 6 +++---
 1 file changed, 3 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-1594]: changed how lines are replaced

Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1594-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit f2d35df1d2fce5fc53596b4374e721b6e0babffb
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Aug 4 16:48:46 2020 +0300

    [DLAB-1594]: changed how lines are replaced
---
 infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 0c9e4a1..eafb2a3 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -158,7 +158,7 @@ def find_replace_line(file_path, searched_str, replacement_line):
         for n, line in enumerate(lines):
             if searched_str in line:
                 lines[n] = replacement_line
-            sudo('echo "{}" >> {}'.format(lines[n], file_path))
+            sudo('echo \'{}\' >> {}'.format(lines[n], file_path))
     except Exception as err:
         traceback.print_exc()
         print('Failed to replace string: ' + str(err))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 01/02: [DLAB-1594]: added ssn. to cert path

Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1594-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 39c40f342d48a14857c74370eb3aaef8f7804d20
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Aug 4 16:37:51 2020 +0300

    [DLAB-1594]: added ssn. to cert path
---
 infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 6fd178d..0c9e4a1 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -167,8 +167,8 @@ def find_replace_line(file_path, searched_str, replacement_line):
 def configure_nginx_LE(domain_name):
     try:
         server_name_line ='     server_name  ssn.{};'.format(domain_name)
-        cert_path_line = '    ssl_certificate  /etc/letsencrypt/live/{}/fullchain.pem;'.format(domain_name)
-        cert_key_line = '    ssl_certificate_key /etc/letsencrypt/live/{}/privkey.pem;'.format(domain_name)
+        cert_path_line = '    ssl_certificate  /etc/letsencrypt/live/ssn.{}/fullchain.pem;'.format(domain_name)
+        cert_key_line = '    ssl_certificate_key /etc/letsencrypt/live/ssn.{}/privkey.pem;'.format(domain_name)
         certbot_service = 'ExecStart = /usr/bin/certbot -q renew --pre-hook "service nginx stop" --post-hook "service nginx start"'
         certbot_service_path = '/lib/systemd/system/certbot.service'
         nginx_config_path = '/etc/nginx/conf.d/nginx_proxy.conf'


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org