[airavata] branch staging updated: AIRAVATA-3081 Ansible: django portal tus config

[ma...@apache.org]

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 a4f8b39  AIRAVATA-3081 Ansible: django portal tus config
a4f8b39 is described below

commit a4f8b39953ff4dd7d6aa5e74aa54668d28a9b41d
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Aug 26 18:03:19 2019 -0400

    AIRAVATA-3081 Ansible: django portal tus config
---
 .../ansible/inventories/scigap/develop/group_vars/django/vars.yml   | 1 +
 dev-tools/ansible/roles/django/defaults/main.yml                    | 1 +
 dev-tools/ansible/roles/django/templates/settings_local.py.j2       | 6 ++++++
 3 files changed, 8 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 db56a72..b11864b 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
@@ -29,3 +29,4 @@ admin_emails: "[('SGRC Group', 'sgrc-iu-group@iu.edu')]"
 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/"
diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml
index de5ac7e..a2727f7 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -43,6 +43,7 @@ django_settings_local_template: "settings_local.py.j2"
 django_extra_settings: {}
 django_database_name: "django_{{ gateway_id }}"
 django_hidden_airavata_apps: "[]"
+django_tus_data_dir: "{{user_data_dir}}/tus-temp-dir"
 
 django_wsgi_processes: 2
 
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 eac29f9..166206f 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -139,6 +139,12 @@ WEBPACK_LOADER = webpack_loader_util.create_webpack_loader_config(STATIC_ROOT)
 # Hidden Airavata apps (not all gateways need all functionality)
 HIDDEN_AIRAVATA_APPS = {{ django_hidden_airavata_apps }}
 
+# Tus uploads
+{% if django_tus_endpoint is defined %}
+TUS_ENDPOINT = "{{ django_tus_endpoint }}"
+TUS_DATA_DIR = "{{ django_tus_data_dir }}"
+{% endif %}
+
 # Extra settings
 {% for extra_setting in django_extra_settings.items() | list %}
 {{ extra_setting[0] }} = '{{ extra_setting[1] }}'