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 2019/10/16 19:44:44 UTC

[airavata] 05/07: Revert "AIRAVATA-2984 Set STATIC_ROOT env var when building js"

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

commit ea710c20802065e4ac79cb2a85672177b7d1d302
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Aug 12 19:54:28 2019 -0400

    Revert "AIRAVATA-2984 Set STATIC_ROOT env var when building js"
    
    This reverts commit c61b2d7c07f40d33ef5f87a9b03d5bc325f1d484.
---
 dev-tools/ansible/roles/django/defaults/main.yml              | 1 -
 dev-tools/ansible/roles/django/templates/settings_local.py.j2 | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml
index 1629b95..2c1a22e 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -20,7 +20,6 @@
 
 ---
 doc_root_dir: "/var/www/django-{{ gateway_id }}"
-static_root_dir: "{{ doc_root_dir }}/static/"
 user_data_dir: "/var/www/user_data"
 django_venv_dir: "{{ doc_root_dir }}/venv"
 # real_user_data_dir is the same as user_data_dir but without symbolic links in it
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 f2715f0..6667375 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -35,7 +35,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # Django - general settings
 DEBUG = {{ django_debug | ternary("True", "False") }}
-STATIC_ROOT = "{{ static_root_dir }}"
+STATIC_ROOT = "{{ doc_root_dir }}/static/"
 ALLOWED_HOSTS = ['{{ vhost_servername }}']
 
 DATABASES = {