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 <[email protected]> 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', '[email protected]'), ('Eroma Abeysinghe', '[email protected]')]" 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"
