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 2021/02/23 00:02:25 UTC
[airavata] 02/02: Merge branch 'airavata-3411' into develop
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 6d18965c858370ac0348096415d2beae3e1f8564
Merge: a252e9c 461da06
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Feb 22 19:01:49 2021 -0500
Merge branch 'airavata-3411' into develop
dev-tools/ansible/django.yml | 2 +
.../scigap/develop/group_vars/django/vars.yml | 2 +-
.../scigap/develop/host_vars/delta/vars.yml | 4 +-
.../scigap/production/group_vars/django/vars.yml | 2 +-
.../scigap/production/host_vars/delta/vars.yml | 4 +-
.../scigap/production/host_vars/dreg/vars.yml | 2 +-
.../production/host_vars/futurewater/vars.yml | 2 +-
.../production/host_vars/global-flood/vars.yml | 53 +++++++++++++
.../production/host_vars/global-flood/vault.yml | 15 ++++
.../scigap/production/host_vars/immune/vars.yml | 53 +++++++++++++
.../scigap/production/host_vars/immune/vault.yml | 15 ++++
.../host_vars/microbial-genomes/vars.yml | 2 +-
.../scigap/production/host_vars/mines/vars.yml | 2 +-
.../host_vars/{mines => regsnps}/vars.yml | 30 ++++----
.../scigap/production/host_vars/regsnps/vault.yml | 15 ++++
.../scigap/production/host_vars/simccs/vars.yml | 2 +-
.../production/host_vars/simvascular/vars.yml | 2 +-
.../ansible/inventories/scigap/production/hosts | 3 +
.../inventories/scigap/production/immune/vault.yml | 15 ++++
.../scigap/staging/group_vars/django/vars.yml | 2 +-
dev-tools/ansible/roles/django/defaults/main.yml | 1 -
dev-tools/ansible/roles/django/tasks/main.yml | 10 +++
.../roles/django/templates/settings_local.py.j2 | 6 +-
dev-tools/ansible/roles/env_setup/tasks/main.yml | 1 +
.../vars.yml => roles/tusd/defaults/main.yml} | 32 ++++----
.../vars.yml => roles/tusd/handlers/main.yml} | 21 ++----
dev-tools/ansible/roles/tusd/tasks/main.yml | 86 ++++++++++++++++++++++
.../tusd/templates/tus-vhost.conf.j2} | 37 +++++-----
.../tusd/templates/tus.service.j2} | 26 +++----
.../init/03-appcatalog-migrations.sql | 6 +-
.../src/main/containers/docker-compose.yml | 4 +-
31 files changed, 362 insertions(+), 95 deletions(-)