Merge branch 'master' of https://github.com/UCL-INGI/INGInious

UCL-INGI · Jun 29, 2015 · d91eb40 · d91eb40
2 parents 5cc5582 + 9d1e322
commit d91eb40
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/doc/installation.rst b/doc/installation.rst
@@ -118,6 +118,24 @@ Each time you have to run INGInious, don't forget to start docker-osx by running
 
 	$ docker-osx start
 
+
+Windows 7+
+``````````
+
+Download and install python_, boot2docker_ and mongodb_. Then proceed to the installation of the following Python
+plugins :
+
+.. _python: https://www.python.org/
+.. _boot2docker: http://boot2docker.io/
+.. _mongodb: https://www.mongodb.org/
+
+::
+
+    C:\> pip install pymongo pytidylib docker-py pbs web.py docutils simpleldap pyyaml rpyc
+
+Boot2docker and MongoDB must be running to run INGInious. To run MongoDB as a service, please refer to th appropriate
+documentation.
+
 Installation of INGInious
 -------------------------
 

diff --git a/frontend/app.py b/frontend/app.py
@@ -105,7 +105,7 @@ def __call__(self, environ, start_response):
         path = self.normpath(path)
 
         if path.startswith(self.prefix):
-            environ["PATH_INFO"] = os.path.join(self.root_path, web.lstrips(path, self.prefix))
+            environ["PATH_INFO"] = self.root_path + "/" + web.lstrips(path, self.prefix)
             return web.httpserver.StaticApp(environ, start_response)
         else:
             return self.app(environ, start_response)