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:48 UTC
[airavata] branch develop updated (63f5d6c -> 087aa75)
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 63f5d6c Merge branch 'airavata-3287' into develop
add 2f9e72d AIRAVATA-2880 Ansible: django_setup role
add f437d23 Ansible: deploy simccs to new server
add 025f2c6 Merge branch 'airavata-3287'
add 3cdfc19 Fixing airavata-3276: Ignoring non-required empty input files adding into groovy script
new 087aa75 Merge branch 'airavata-3276' into develop
The 1 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:
.../newsimccs}/files/django-ssl-vhost.conf.j2 | 0
.../host_vars/{simccs => newsimccs}/vars.yml | 16 +++-
.../host_vars/newsimccs}/vault.yml | 0
.../ansible/inventories/scigap/production/hosts | 2 +
.../roles/django/templates/settings_local.py.j2 | 4 +-
.../handlers => django_setup/defaults}/main.yml | 16 ++--
.../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 +
.../tasks/install_deps_CentOS_7.yml} | 19 ++---
.../tasks/install_deps_Ubuntu_16.yml | 17 ----
dev-tools/ansible/roles/httpd/tasks/main.yml | 2 +
.../impl/task/staging/InputDataStagingTask.java | 4 +-
.../task/submission/config/GroovyMapBuilder.java | 8 ++
14 files changed, 99 insertions(+), 85 deletions(-)
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/simccs => production/host_vars/newsimccs}/files/django-ssl-vhost.conf.j2 (100%)
copy dev-tools/ansible/inventories/scigap/production/host_vars/{simccs => newsimccs}/vars.yml (82%)
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/simccs => production/host_vars/newsimccs}/vault.yml (100%)
copy dev-tools/ansible/roles/{database/handlers => django_setup/defaults}/main.yml (73%)
create mode 100644 dev-tools/ansible/roles/django_setup/files/00-wsgi.conf
copy dev-tools/ansible/roles/{database/handlers/main.yml => httpd/tasks/install_deps_CentOS_7.yml} (76%)
copy dev-tools/ansible/roles/{pga => httpd}/tasks/install_deps_Ubuntu_16.yml (79%)
[airavata] 01/01: Merge branch 'airavata-3276' into develop
Posted by di...@apache.org.
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(-)