Merge pull request #449 from MITx/feature/dave/wiki_proxy

Config changes relating to course server split

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'])
+

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;
+      }
+
     }
 }