You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2023/06/05 22:19:36 UTC

[airavata] branch develop updated (1937289596 -> 4da6cffda5)

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

machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


    from 1937289596 Ansible: add zenodo integration django app to dev-gkeyll
     add 8a30c61ee5 Ansible: add ssl certificate generation and HAProxy for api server
     new c3ac4b390f Merge branch 'ansible-haproxy' into develop
     add 960086dcf6 Ansible fixes and configuring api server to NOT listen on TLS port
     add fe68cafe32 Removing unneeded task
     new 4da6cffda5 Merge branch 'ansible-haproxy' into develop

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:
 dev-tools/ansible/airavata.yml                     |  1 +
 dev-tools/ansible/apiserver.yml                    |  1 +
 .../scigap/develop/group_vars/all/vars.yml         |  3 +-
 .../scigap/production/group_vars/all/vars.yml      |  2 +-
 dev-tools/ansible/roles/api-orch/defaults/main.yml |  5 ++
 .../files/prepareLetsEncryptCertificates.sh        | 13 ++++
 .../{common/vars => api-orch/handlers}/main.yml    |  6 +-
 .../tasks/haproxy}/install_deps_Centos_7.yml       |  4 +-
 .../tasks/haproxy}/install_deps_Rocky_8.yml        |  4 +-
 dev-tools/ansible/roles/api-orch/tasks/main.yml    | 53 +++++++++++++++
 .../roles/api-orch/templates/haproxy.cfg.j2        | 75 ++++++++++++++++++++++
 11 files changed, 158 insertions(+), 9 deletions(-)
 create mode 100644 dev-tools/ansible/roles/api-orch/files/prepareLetsEncryptCertificates.sh
 copy dev-tools/ansible/roles/{common/vars => api-orch/handlers}/main.yml (89%)
 copy dev-tools/ansible/roles/{django/tasks => api-orch/tasks/haproxy}/install_deps_Centos_7.yml (90%)
 copy dev-tools/ansible/roles/{django/tasks => api-orch/tasks/haproxy}/install_deps_Rocky_8.yml (93%)
 create mode 100644 dev-tools/ansible/roles/api-orch/templates/haproxy.cfg.j2


[airavata] 02/02: Merge branch 'ansible-haproxy' into develop

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

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 4da6cffda5acb38e4a79341e466acfee2d123f6e
Merge: c3ac4b390f fe68cafe32
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 5 18:19:25 2023 -0400

    Merge branch 'ansible-haproxy' into develop

 .../scigap/develop/group_vars/all/vars.yml            |  2 +-
 .../scigap/production/group_vars/all/vars.yml         |  2 +-
 dev-tools/ansible/roles/api-orch/tasks/main.yml       | 19 +++++++------------
 .../ansible/roles/api-orch/templates/haproxy.cfg.j2   |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)



[airavata] 01/02: Merge branch 'ansible-haproxy' into develop

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

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit c3ac4b390f46672455a49cbc4e3df4d1ff11bf60
Merge: 1937289596 8a30c61ee5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 5 17:20:27 2023 -0400

    Merge branch 'ansible-haproxy' into develop

 dev-tools/ansible/airavata.yml                     |  1 +
 dev-tools/ansible/apiserver.yml                    |  1 +
 .../scigap/develop/group_vars/all/vars.yml         |  1 +
 dev-tools/ansible/roles/api-orch/defaults/main.yml |  5 ++
 .../files/prepareLetsEncryptCertificates.sh        | 13 ++++
 .../api-orch/handlers/main.yml}                    | 20 +-----
 .../tasks/haproxy/install_deps_Centos_7.yml}       | 18 ++----
 .../tasks/haproxy/install_deps_Rocky_8.yml}        | 22 +++----
 dev-tools/ansible/roles/api-orch/tasks/main.yml    | 58 +++++++++++++++++
 .../roles/api-orch/templates/haproxy.cfg.j2        | 75 ++++++++++++++++++++++
 10 files changed, 169 insertions(+), 45 deletions(-)