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/01/24 21:39:10 UTC

[airavata] 02/03: Merge branch 'ansible-django-vhost-timeout' 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 1082e09a36843ca482fcc7bf6f63a8626f28cf4e
Merge: 59972be d8aacab
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 24 16:19:01 2020 -0500

    Merge branch 'ansible-django-vhost-timeout' into develop

 .../scigap/production/host_vars/delta/vars.yml     |  3 +-
 .../newsimccs/files/django-ssl-vhost.conf.j2       | 82 ----------------------
 .../scigap/production/host_vars/newsimccs/vars.yml | 70 ------------------
 .../production/host_vars/newsimccs/vault.yml       | 15 ----
 .../scigap/production/host_vars/simccs/vars.yml    | 15 ++--
 .../scigap/production/host_vars/testdrive/vars.yml |  2 +-
 .../ansible/inventories/scigap/production/hosts    |  3 +-
 dev-tools/ansible/roles/django/defaults/main.yml   |  1 +
 .../django/templates/django-ssl-vhost.conf.j2      |  1 +
 .../roles/django/templates/django-vhost.conf.j2    |  1 +
 10 files changed, 18 insertions(+), 175 deletions(-)