From 46ff32b0b90c3929e5a052d7e20f50e10c4390e2 Mon Sep 17 00:00:00 2001 From: Dongwook Date: Fri, 24 Jul 2015 19:30:12 +0000 Subject: [PATCH 1/2] update authors --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 1c7c99e461..eb471953c2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -229,3 +229,4 @@ Pan Luo Tyler Nickerson Vedran Karačić William Ono +Dongwook Yoon From e7aa8fc1765f91030bcba8c50bc4c6f1377c3f5d Mon Sep 17 00:00:00 2001 From: Dongwook Date: Fri, 24 Jul 2015 17:10:04 +0000 Subject: [PATCH 2/2] allows platform version formatting as a part of static url served by djpyfs --- cms/envs/aws.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 81304c4af8..4c239d521f 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -238,6 +238,8 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "auth.json") as auth_file: ############### XBlock filesystem field config ########## if 'DJFS' in AUTH_TOKENS and AUTH_TOKENS['DJFS'] is not None: DJFS = AUTH_TOKENS['DJFS'] + if 'url_root' in DJFS: + DJFS['url_root'] = DJFS['url_root'].format(platform_revision=EDX_PLATFORM_REVISION) EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', EMAIL_HOST_USER) EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', EMAIL_HOST_PASSWORD)