[airavata] branch develop updated: Django Ansible: create tmp directory for uploads

[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


The following commit(s) were added to refs/heads/develop by this push:
     new 71a0e34  Django Ansible: create tmp directory for uploads
71a0e34 is described below

commit 71a0e3421c98f4ee9f17fcf2a776d405a24dadb8
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Oct 12 17:48:54 2018 -0400

    Django Ansible: create tmp directory for uploads
---
 dev-tools/ansible/roles/django/defaults/main.yml              | 1 +
 dev-tools/ansible/roles/django/tasks/main.yml                 | 4 ++++
 dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml
index a5007bc..dc35dbe 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -61,6 +61,7 @@ airavata_django_checkout: "{{ doc_root_dir}}/airavata-django-portal"
 gateway_id: "{{ default_gateway }}"
 # relative to document root dir
 experiment_data_dir: "{{ user_data_dir }}"
+file_upload_tmp_dir: "{{ experiment_data_dir }}/tmp/"
 gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19"
 gateway_data_store_hostname: "{{ groups['django'][0] }}"
 
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml
index f926b6a..871c5aa 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -75,6 +75,10 @@
   file: path="{{ experiment_data_dir }}" state=directory owner="{{user}}" group="{{group}}" recurse=yes follow=yes
   become: yes
 
+- name: Create file upload tmp dir
+  file: path="{{ file_upload_tmp_dir }}" state=directory owner="{{user}}" group="{{group}}" recurse=yes
+  become: yes
+
 - name: set selinux context to allow read on static directory
   sefcontext:
     target: "{{ doc_root_dir }}/static(/.*)?"
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 c4e406d..faec524 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -87,7 +87,7 @@ SHARING_API_PORT = {{ sharing_registry_port }}
 SHARING_API_SECURE = False
 
 STATIC_ROOT = "{{ doc_root_dir }}/static/"
-FILE_UPLOAD_TEMP_DIR = "{{ experiment_data_dir }}/tmp/"
+FILE_UPLOAD_TEMP_DIR = "{{ file_upload_tmp_dir }}"
 
 ALLOWED_HOSTS = ['{{ vhost_servername }}']