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 2021/07/27 19:06:05 UTC
[airavata] branch develop updated (25464e4 -> 0d42f70)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 25464e4 Merge branch 'airavata-3319' into develop
new f8ed00e AIRAVATA-3319 Ansible: add external IDP userinfo config
new 0d42f70 Merge branch 'airavata-3319' into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml | 2 ++
.../inventories/scigap/production/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/production/host_vars/delta/vars.yml | 2 ++
.../inventories/scigap/production/host_vars/seagrid/vars.yml | 2 ++
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 6 ++++++
6 files changed, 14 insertions(+)
[airavata] 01/02: AIRAVATA-3319 Ansible: add external IDP userinfo
config
Posted by 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 f8ed00e398c34a95fa8b81301881b62eec54afcc
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jul 27 15:04:47 2021 -0400
AIRAVATA-3319 Ansible: add external IDP userinfo config
---
.../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml | 2 ++
.../inventories/scigap/production/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/production/host_vars/delta/vars.yml | 2 ++
.../inventories/scigap/production/host_vars/seagrid/vars.yml | 2 ++
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 6 ++++++
6 files changed, 14 insertions(+)
diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
index 194ace4..614b3e7 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
@@ -32,3 +32,4 @@ django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.dev.scigap.org/files/"
airavata_django_git_branch: "develop"
# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
+cilogon_userinfo_url: "https://cilogon.org/oauth2/userinfo"
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
index 9b268f7..922710f 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml
@@ -36,6 +36,8 @@ auth_options:
external:
- name: "CILogon"
idp_alias: "oidc"
+ idp_token_url: "{{ oauth_service_url }}/realms/{{ tenant_domain }}/broker/oidc/token"
+ userinfo_url: "{{ cilogon_userinfo_url }}"
gateway_id: "seagrid"
experiment_data_dir: "{{ user_data_dir }}/django-seagrid"
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
index 8f5d4a8..280dab2 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
@@ -29,6 +29,7 @@ django_database_name: "django_{{ inventory_hostname }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
django_tus_endpoint: "https://tus.airavata.org/files/"
# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
+cilogon_userinfo_url: "https://cilogon.org/oauth2/userinfo"
# Default email settings
portal_email_host: "smtp.gmail.com"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/delta/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/delta/vars.yml
index 1428c26..902b2ee 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/delta/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/delta/vars.yml
@@ -48,6 +48,8 @@ auth_options:
- name: "existing institution credentials"
idp_alias: "cilogon"
logo: "images/cilogon-logo-24x24-b.png"
+ idp_token_url: "{{ oauth_service_url }}/realms/{{ tenant_domain }}/broker/cilogon/token"
+ userinfo_url: "{{ cilogon_userinfo_url }}"
gateway_id: "delta"
experiment_data_dir: "{{ user_data_dir }}/delta"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/seagrid/vars.yml
index 06f75d1..5351ba3 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/seagrid/vars.yml
@@ -42,6 +42,8 @@ auth_options:
external:
- name: "CILogon"
idp_alias: "cilogon"
+ idp_token_url: "{{ oauth_service_url }}/realms/{{ tenant_domain }}/broker/cilogon/token"
+ userinfo_url: "{{ cilogon_userinfo_url }}"
gateway_id: "seagrid"
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 90e5bda..6113909 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -104,6 +104,12 @@ AUTHENTICATION_OPTIONS = {
{% if external.logo is defined %}
'logo': '{{ external.logo }}',
{% endif %}
+ {% if external.idp_token_url is defined %}
+ 'idp_token_url': '{{ external.idp_token_url }}',
+ {% endif %}
+ {% if external.userinfo_url is defined %}
+ 'userinfo_url': '{{ external.userinfo_url }}',
+ {% endif %}
},
{% endfor %}
]
[airavata] 02/02: Merge branch 'airavata-3319' into develop
Posted by 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 0d42f70088f17d091c2efb2a237973e6e6226f34
Merge: 25464e4 f8ed00e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jul 27 15:04:57 2021 -0400
Merge branch 'airavata-3319' into develop
.../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml | 2 ++
.../inventories/scigap/production/group_vars/django/vars.yml | 1 +
.../ansible/inventories/scigap/production/host_vars/delta/vars.yml | 2 ++
.../inventories/scigap/production/host_vars/seagrid/vars.yml | 2 ++
dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 6 ++++++
6 files changed, 14 insertions(+)
diff --cc dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
index cef47c6,614b3e7..b5e9ba4
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
@@@ -29,7 -29,7 +29,8 @@@ admin_emails: "[('SGRC Group', 'sgrc-iu
django_error_emails: "[('Marcus Christie', 'machrist@iu.edu'), ('Eroma Abeysinghe', 'eabeysin@iu.edu')]"
django_database_name: "django_{{ gateway_id }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
-django_tus_endpoint: "https://tus.dev.scigap.org/files/"
+tusd_vhost_servername: "tus.dev.scigap.org"
+tusd_upload_dir: "{{real_user_data_dir}}/tus-temp-dir"
airavata_django_git_branch: "develop"
# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
+ cilogon_userinfo_url: "https://cilogon.org/oauth2/userinfo"
diff --cc dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
index 59b6506,280dab2..cd19f5b
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
@@@ -27,8 -27,9 +27,9 @@@ django_wsgi_processes:
doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
django_database_name: "django_{{ inventory_hostname }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
-django_tus_endpoint: "https://tus.airavata.org/files/"
+tusd_vhost_servername: "tus.airavata.org"
# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
+ cilogon_userinfo_url: "https://cilogon.org/oauth2/userinfo"
# Default email settings
portal_email_host: "smtp.gmail.com"