You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by di...@apache.org on 2020/01/03 19:38:49 UTC

[airavata] 01/01: Merge branch 'airavata-3276' into develop

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

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

commit 087aa75f0c30b3c34c7a7d64d48847d913714dcd
Merge: 63f5d6c 3cdfc19
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Fri Jan 3 14:37:31 2020 -0500

    Merge branch 'airavata-3276' into develop

 .../newsimccs/files/django-ssl-vhost.conf.j2       | 82 +++++++++++++++++++
 .../scigap/production/host_vars/newsimccs/vars.yml | 71 +++++++++++++++++
 .../production/host_vars/newsimccs/vault.yml       | 15 ++++
 .../ansible/inventories/scigap/production/hosts    |  2 +
 .../roles/django/templates/settings_local.py.j2    |  4 +-
 .../{httpd => django_setup}/defaults/main.yml      | 17 ++--
 .../ansible/roles/django_setup/files/00-wsgi.conf  |  1 +
 .../ansible/roles/django_setup/tasks/main.yml      | 91 ++++++++++++----------
 dev-tools/ansible/roles/httpd/defaults/main.yml    |  4 +
 .../main.yml => tasks/install_deps_CentOS_7.yml}   | 24 +++---
 .../roles/httpd/tasks/install_deps_Ubuntu_16.yml   | 64 +++++++++++++++
 dev-tools/ansible/roles/httpd/tasks/main.yml       |  2 +
 .../impl/task/staging/InputDataStagingTask.java    |  4 +-
 .../task/submission/config/GroovyMapBuilder.java   |  8 ++
 14 files changed, 321 insertions(+), 68 deletions(-)