This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/staging by this push:
new 8b189d2 Add logo to auth options
8b189d2 is described below
commit 8b189d2db10a7a03f39f0f7fb894447a9a6a5bfb
Author: Marcus Christie <[email protected]>
AuthorDate: Fri Jul 26 11:47:22 2019 -0400
Add logo to auth options
---
.../ansible/inventories/scigap/staging/host_vars/pearc19/vars.yml | 1 +
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git
a/dev-tools/ansible/inventories/scigap/staging/host_vars/pearc19/vars.yml
b/dev-tools/ansible/inventories/scigap/staging/host_vars/pearc19/vars.yml
index 62160c8..031525c 100644
--- a/dev-tools/ansible/inventories/scigap/staging/host_vars/pearc19/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/host_vars/pearc19/vars.yml
@@ -36,6 +36,7 @@ auth_options:
external:
- name: "CILogon"
idp_alias: "cilogon"
+ logo: "images/cilogon-logo-24x24-b.png"
gateway_id: "pearc19"
experiment_data_dir: "{{ user_data_dir }}/seagrid"
diff --git a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
index df5a290..eac29f9 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -84,7 +84,10 @@ AUTHENTICATION_OPTIONS = {
{% if auth_options.password %}
'password': {
- 'name': '{{ auth_options.password.name }}'
+ 'name': '{{ auth_options.password.name }}',
+ {% if auth_options.password.logo is defined %}
+ 'logo': '{{ auth_options.password.logo }}',
+ {% endif %}
},
{% endif %}
{% if auth_options.external %}
@@ -93,6 +96,9 @@ AUTHENTICATION_OPTIONS = {
{
'idp_alias': '{{ external.idp_alias }}',
'name': '{{ external.name }}',
+ {% if external.logo is defined %}
+ 'logo': '{{ external.logo }}',
+ {% endif %}
},
{% endfor %}
]