Merge pull request #7931 from rtibbles/custom_channels_merge

Add content serving on alternate origin.
learningequality · Mar 27, 2021 · 781cadf · 781cadf
2 parents ee28eb1 + 8ff0ba7
commit 781cadf
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/kolibri/utils/server.py b/kolibri/utils/server.py
@@ -297,7 +297,7 @@ def configure_http_server(port):
     ).lstrip("/")
     content_dirs = [paths.get_content_dir_path()] + paths.get_content_fallback_paths()
     dispatcher = MultiStaticDispatcher(content_dirs)
-    cherrypy.tree.mount(
+    content_handler = cherrypy.tree.mount(
         None,
         CONTENT_ROOT,
         config={"/": {"tools.caching.on": False, "request.dispatch": dispatcher}},
@@ -323,7 +323,10 @@ def configure_http_server(port):
     )
 
     # Mount static files
-    alt_port_app = DjangoWhiteNoise(get_application(), **whitenoise_settings)
+    alt_port_app = wsgi.PathInfoDispatcher(
+        {"/": get_application(), CONTENT_ROOT: content_handler}
+    )
+    alt_port_app = DjangoWhiteNoise(alt_port_app, **whitenoise_settings)
 
     alt_port_server = ServerAdapter(
         cherrypy.engine,