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/02/19 18:17:14 UTC
[airavata] 02/02: Merge branch
'AIRAVATA-3290--Ansible--automatically-set-wagtail-site-record' 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 253a96b60b82df7cdceb35a265eaa90b7988eb22
Merge: 2e00338 3ea326f
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Feb 19 12:59:11 2020 -0500
Merge branch 'AIRAVATA-3290--Ansible--automatically-set-wagtail-site-record' into develop
.../scigap/production/group_vars/django/vars.yml | 2 +-
.../production/host_vars/distantreader/vars.yml | 2 +-
.../scigap/production/host_vars/dreg/vars.yml | 2 +-
.../production/host_vars/futurewater/vars.yml | 2 ++
.../{toppic => microbial-genomes}/vars.yml | 22 +++++++++++-----------
.../host_vars/microbial-genomes/vault.yml | 15 +++++++++++++++
.../simccs/files/django-ssl-vhost.conf.j2 | 1 +
.../scigap/production/host_vars/simccs/vars.yml | 18 ++++++++++++------
.../scigap/production/host_vars/testdrive/vars.yml | 2 ++
.../scigap/production/host_vars/toppic/vars.yml | 2 ++
.../ansible/inventories/scigap/production/hosts | 1 +
dev-tools/ansible/roles/django/tasks/main.yml | 13 +++++++++++--
12 files changed, 60 insertions(+), 22 deletions(-)