From 9806deee386c1742e4cab2c34546f9ec3487d3ba Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Fri, 17 Aug 2012 14:05:38 -0400 Subject: [PATCH 1/2] Add proxy rule for wiki for local testing of split servers --- proxy/nginx.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proxy/nginx.conf b/proxy/nginx.conf index 470c3933ac..2b48e17d03 100644 --- a/proxy/nginx.conf +++ b/proxy/nginx.conf @@ -61,6 +61,11 @@ http { location /courses/MITx/6.002x/2012_Fall/ { proxy_pass http://course_mitx_6002_2012_fall; } + + location ~ /courses/([^/]*)/([^/]*)/([^/]*)/(course_wiki|wiki) { + proxy_pass http://portal; + } + } } From 83ea5efac6772f5973fd4347df5093c1e7cfc712 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Fri, 17 Aug 2012 14:34:58 -0400 Subject: [PATCH 2/2] add course-specific askbot URLs for AWS course servers --- lms/envs/aws.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index c704fd164e..d2d71830b0 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -56,3 +56,7 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"] DATABASES = AUTH_TOKENS['DATABASES'] XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE'] + +if 'COURSE_ID' in ENV_TOKENS: + ASKBOT_URL = "courses/{0}/discussions/".format(ENV_TOKENS['COURSE_ID']) +