[airavata] 02/02: Merge branch 'keycloak-letsencrypt-proxy' into develop

[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 538d3f477be199fd16789c094aea5524d17db5cb
Merge: 18caaf5 5aeea33
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Jun 18 16:58:31 2020 -0400

    Merge branch 'keycloak-letsencrypt-proxy' into develop

 .../scigap/develop/group_vars/all/vars.yml         |  1 +
 .../scigap/production/group_vars/all/vars.yml      |  3 +-
 .../host_vars/{smaltr => bcbportal}/vars.yml       | 22 ++---
 .../production/host_vars/bcbportal/vault.yml       | 15 ++++
 .../scigap/production/host_vars/dreg/vars.yml      |  3 +
 .../host_vars/microbial-genomes/vars.yml           |  4 +
 .../scigap/production/host_vars/mines/vars.yml     |  1 +
 .../scigap/production/host_vars/physicell/vars.yml |  8 +-
 .../scigap/production/host_vars/smaltr/vars.yml    |  2 +-
 .../ansible/inventories/scigap/production/hosts    |  1 +
 .../scigap/staging/group_vars/all/vars.yml         |  1 +
 dev-tools/ansible/keycloak.yml                     |  3 +-
 dev-tools/ansible/roles/httpd/defaults/main.yml    |  7 ++
 dev-tools/ansible/roles/httpd/tasks/main.yml       |  2 +-
 dev-tools/ansible/roles/keycloak/README.md         | 10 +--
 dev-tools/ansible/roles/keycloak/defaults/main.yml | 15 ++--
 dev-tools/ansible/roles/keycloak/files/README.md   | 36 ---------
 .../keycloak/handlers/main.yml}                    | 11 +--
 dev-tools/ansible/roles/keycloak/tasks/main.yml    | 94 +++++++++++-----------
 .../roles/keycloak/templates/basic-vhost.conf.j2   |  9 +++
 .../roles/keycloak/templates/standalone.xml.j2     | 15 ++--
 .../ansible/roles/keycloak/templates/vhost.conf.j2 | 52 ++++++++++++
 .../helix/impl/task/staging/ArchiveTask.java       |  2 +-
 23 files changed, 184 insertions(+), 133 deletions(-)

diff --cc dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index e102856,2cd74c2..1ccaecd
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@@ -178,5 -179,3 +179,5 @@@ parser_broker_topic: "completed-message
  parser_broker_consumer_group: "ParsingConsumer"
  parser_storage_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
  parser_broker_publisher_id: "ParserProducer"
 +
- usage_reporting_key: "{{ vault_usage_reporting_key }}"
++usage_reporting_key: "{{ vault_usage_reporting_key }}"