summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlmog Laktivi <al942u@att.com>2017-11-21 18:13:19 +0200
committerAlmog Laktivi <al942u@att.com>2017-11-21 18:13:28 +0200
commitcda06963be53b962d286ef8b6306ce55d1eef314 (patch)
tree09f87a23db2a0a501754cccb5d12e727f14b3c87
parent97fc837a29af8757a036eed513b95833f1cdab24 (diff)
Add CSIT test tox settings
Add template of settings with the right variables Change-Id: I5b7d23518608eb4c79f8536db060583746c26b76 Issue-ID: VVP-21 Signed-off-by: Almog Laktivi <al942u@att.com>
-rw-r--r--django/vvp/settings/tox_settings.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/vvp/settings/tox_settings.py b/django/vvp/settings/tox_settings.py
index 1963d25..4a2cf6e 100644
--- a/django/vvp/settings/tox_settings.py
+++ b/django/vvp/settings/tox_settings.py
@@ -326,7 +326,7 @@ DEFAULT_FILE_STORAGE = 'vvp.settings.storage.S3MediaStorage'
STATICFILES_STORAGE = 'vvp.settings.storage.S3StaticStorage'
# These seem to have no effect even when we don't override with custom_domain?
-STATIC_URL = 'https://%s/%s/' % (AWS_S3_CUSTOM_DOMAIN, STATIC_BUCKET)
-MEDIA_URL = 'https://%s/%s/' % (AWS_S3_CUSTOM_DOMAIN, MEDIA_BUCKET)
+STATIC_ROOT = os.environ['STATIC_ROOT']
+STATIC_URL = '/static/'
STATIC_ROOT = os.environ['STATIC_ROOT']