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 2020/09/18 18:47:13 UTC
[airavata] branch develop updated (d65c9f1 -> 15ec606)
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 d65c9f1 Ansible: Interactwel post login landing page setting
add e175e2a Fixing minor ansible issues in the migration
add 56ba019 Added new email for new user account notifications in LROSE
add e665821 Ansible: remove java role from django playbook since we don't want the updated one (java 11) and only one django portal needs java
add fc9fdb0 Added google analytics tracking ID
add 5258ddc Added google analytics tracking ID to AMP gateway
add 3ccd513 Added google analytics tracking ID to Distant reader gateway
add 5536d04 Added google analytics tracking ID to BCB gateway
add 1d6f0e1 Added google analytics tracking ID to DELTA gateway
add e0e02b2 Added google analytics tracking ID to LROSE gateway
add 0d0992a Added google analytics tracking ID to Saver-X gateway
add 549ed51 Added google analytics tracking ID to Search SRA gateway
add b9276a4 Added google analytics tracking ID to SMALTR gateway
add 386b6ad Added google analytics tracking IDs to V4I and TopPIC gateways
add dfe7dde Removing wildcard validation
add 7925b9f Ansible: fixing typo in email
add f28bc9c AIRAVATA-3368 Move django database setup to django role
add 5b70d6e AIRAVATA-3368 Make Django database server configurable
add 29e0ac9 Merge pull request #262 from apache:AIRAVATA-3368-ansible-create-django-database-as-part-of-django-
add 32318dc Ansible: rename, keep old simvascular deploy until migration is complete
add b40a934 Ansible: enable Django deploy on Ubuntu 18
add 05b734d Ansible: PGA deploy on Ubuntu 18
add aef45ae Ansible: fix default DocumentRoot on Ubuntu 18
add 0476158 Ansible: for PGA, enable php5.6 module on Ubuntu 18
add 5aa09d0 Ansible: configure django db backend
add 7724d22 Ansible: simvascular.stanford.edu deployment
add 24bd94c Ansible: simvascular tus endpoint
add 181834e Ansible: deploy Django portal to simvascular server with its own local database
new 15ec606 Merge branch 'master' 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:
dev-tools/ansible/database.yml | 1 -
dev-tools/ansible/django.yml | 4 +-
.../scigap/production/group_vars/all/vars.yml | 2 +-
.../production/host_vars/ampgateway/vars.yml | 2 +
.../scigap/production/host_vars/bcbportal/vars.yml | 2 +
.../scigap/production/host_vars/delta/vars.yml | 1 +
.../production/host_vars/distantreader/vars.yml | 1 +
.../scigap/production/host_vars/lrose/vars.yml | 3 +-
.../host_vars/microbial-genomes/vars.yml | 1 +
.../scigap/production/host_vars/saverx/vars.yml | 1 +
.../scigap/production/host_vars/searchsra/vars.yml | 1 +
.../production/host_vars/simvascular/vars.yml | 23 ++++--
.../production/host_vars/simvascular/vault.yml | 31 ++++----
.../{simvascular => simvascular_old}/vars.yml | 1 +
.../{simvascular => simvascular_old}/vault.yml | 0
.../scigap/production/host_vars/smaltr/vars.yml | 1 +
.../scigap/production/host_vars/toppic/vars.yml | 2 +
.../scigap/production/host_vars/v4i/vars.yml | 1 +
.../ansible/inventories/scigap/production/hosts | 6 +-
.../production/pga_config/simvascular/vars.yml | 14 ++--
dev-tools/ansible/pga-single-vhost.yml | 1 +
dev-tools/ansible/pga.yml | 1 +
dev-tools/ansible/roles/common/defaults/main.yml | 4 +-
dev-tools/ansible/roles/database/tasks/main.yml | 3 -
dev-tools/ansible/roles/django/defaults/main.yml | 9 ++-
.../tasks/django.yml => django/tasks/database.yml} | 29 ++++----
dev-tools/ansible/roles/django/tasks/main.yml | 15 ++++
.../roles/django/templates/settings_local.py.j2 | 4 +-
.../tasks/{main.yml => install_deps_CentOS_7.yml} | 5 +-
.../tasks/install_deps_Ubuntu_18.yml} | 21 +++---
.../ansible/roles/django_setup/tasks/main.yml | 87 +---------------------
dev-tools/ansible/roles/env_setup/tasks/main.yml | 13 ++++
dev-tools/ansible/roles/httpd/defaults/main.yml | 3 +
.../roles/httpd/tasks/install_deps_Ubuntu_16.yml | 7 --
...eps_CentOS_7.yml => install_deps_Ubuntu_18.yml} | 21 ++++--
dev-tools/ansible/roles/httpd/tasks/main.yml | 41 ++++++++++
.../ansible/roles/httpd/templates/default.conf.j2 | 4 +-
dev-tools/ansible/roles/java/tasks/main.yml | 1 +
dev-tools/ansible/roles/letsencrypt/tasks/main.yml | 20 +++++
...ps_Ubuntu_14.yml => install_deps_Ubuntu_18.yml} | 59 ++++++---------
dev-tools/ansible/roles/pga/tasks/main.yml | 30 +-------
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 2 +
42 files changed, 247 insertions(+), 231 deletions(-)
copy dev-tools/ansible/inventories/scigap/production/host_vars/{simvascular => simvascular_old}/vars.yml (98%)
copy dev-tools/ansible/inventories/scigap/production/host_vars/{simvascular => simvascular_old}/vault.yml (100%)
rename dev-tools/ansible/roles/{database/tasks/django.yml => django/tasks/database.yml} (70%)
copy dev-tools/ansible/roles/django_setup/tasks/{main.yml => install_deps_CentOS_7.yml} (97%)
copy dev-tools/ansible/roles/{httpd/tasks/install_deps_CentOS_7.yml => django_setup/tasks/install_deps_Ubuntu_18.yml} (69%)
copy dev-tools/ansible/roles/httpd/tasks/{install_deps_CentOS_7.yml => install_deps_Ubuntu_18.yml} (75%)
copy dev-tools/ansible/roles/pga/tasks/{install_deps_Ubuntu_14.yml => install_deps_Ubuntu_18.yml} (58%)
[airavata] 01/01: Merge branch 'master' 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 15ec606a7c5e29fd13d088aeab1bf2c4373082ad
Merge: d65c9f1 181834e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Sep 18 14:42:04 2020 -0400
Merge branch 'master' into develop
dev-tools/ansible/database.yml | 1 -
dev-tools/ansible/django.yml | 4 +-
.../scigap/production/group_vars/all/vars.yml | 2 +-
.../production/host_vars/ampgateway/vars.yml | 2 +
.../scigap/production/host_vars/bcbportal/vars.yml | 2 +
.../scigap/production/host_vars/delta/vars.yml | 1 +
.../production/host_vars/distantreader/vars.yml | 1 +
.../scigap/production/host_vars/lrose/vars.yml | 3 +-
.../host_vars/microbial-genomes/vars.yml | 1 +
.../scigap/production/host_vars/saverx/vars.yml | 1 +
.../scigap/production/host_vars/searchsra/vars.yml | 1 +
.../production/host_vars/simvascular/vars.yml | 23 ++++--
.../production/host_vars/simvascular/vault.yml | 31 ++++----
.../{simvascular => simvascular_old}/vars.yml | 1 +
.../{simvascular => simvascular_old}/vault.yml | 0
.../scigap/production/host_vars/smaltr/vars.yml | 1 +
.../scigap/production/host_vars/toppic/vars.yml | 2 +
.../scigap/production/host_vars/v4i/vars.yml | 1 +
.../ansible/inventories/scigap/production/hosts | 6 +-
.../production/pga_config/simvascular/vars.yml | 14 ++--
dev-tools/ansible/pga-single-vhost.yml | 1 +
dev-tools/ansible/pga.yml | 1 +
dev-tools/ansible/roles/common/defaults/main.yml | 4 +-
dev-tools/ansible/roles/database/tasks/main.yml | 3 -
dev-tools/ansible/roles/django/defaults/main.yml | 9 ++-
.../tasks/django.yml => django/tasks/database.yml} | 29 ++++----
dev-tools/ansible/roles/django/tasks/main.yml | 15 ++++
.../roles/django/templates/settings_local.py.j2 | 4 +-
.../tasks/{main.yml => install_deps_CentOS_7.yml} | 5 +-
.../django_setup/tasks/install_deps_Ubuntu_18.yml} | 27 ++++---
.../ansible/roles/django_setup/tasks/main.yml | 87 +---------------------
dev-tools/ansible/roles/env_setup/tasks/main.yml | 13 ++++
dev-tools/ansible/roles/httpd/defaults/main.yml | 3 +
.../roles/httpd/tasks/install_deps_Ubuntu_16.yml | 7 --
.../httpd/tasks/install_deps_Ubuntu_18.yml} | 29 +++++---
dev-tools/ansible/roles/httpd/tasks/main.yml | 41 ++++++++++
.../ansible/roles/httpd/templates/default.conf.j2 | 4 +-
dev-tools/ansible/roles/java/tasks/main.yml | 1 +
dev-tools/ansible/roles/letsencrypt/tasks/main.yml | 20 +++++
.../tasks/install_deps_Ubuntu_18.yml} | 43 +++++++----
dev-tools/ansible/roles/pga/tasks/main.yml | 30 +-------
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 2 +
42 files changed, 260 insertions(+), 216 deletions(-)