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/06/18 21:00:10 UTC

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

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 00a1f0f522932f906ed39157a5416eb34a51a06e
Merge: 47c23ea 5aeea33
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Jun 18 16:59:46 2020 -0400

    Merge branch 'keycloak-letsencrypt-proxy'

 .../scigap/develop/group_vars/all/vars.yml         |  1 +
 .../scigap/production/group_vars/all/vars.yml      |  3 +-
 .../scigap/staging/group_vars/all/vars.yml         |  1 +
 dev-tools/ansible/keycloak.yml                     |  3 +-
 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 ++++++++++++
 12 files changed, 135 insertions(+), 115 deletions(-)