Merge pull request #4225 from magfest/uber_root

Moving uber webroot to /

Dockerfile

@@ -38,7 +38,7 @@ ADD . plugins/uber/
 ENV HOST=0.0.0.0
 ENV PORT=8282
 ENV HOSTNAME=localhost
-ENV DEFAULT_URL=/uber
+ENV DEFAULT_URL=
 ENV DEBUG=false
 ENV SESSION_HOST=redis
 ENV SESSION_PORT=6379

uber/configspec.ini

@@ -198,7 +198,7 @@ extra_checkin_docs = string(default='')
 # The path used to mount the app in cherrypy's mount tree. This may be
 # different from the "path" setting if the server is running behind a
 # reverse proxy with rewrite rules that change the URL path.
-cherrypy_mount_path = string(default="/uber")
+cherrypy_mount_path = string(default="")
 
 # These are used for web server configuration and for linking back to our
 # pages in emails; these definitely need to be overridden in production.

uber/server.py

@@ -12,7 +12,6 @@
 from pockets.autolog import log
 from sideboard.jsonrpc import json_handler, ERR_INVALID_RPC, ERR_MISSING_FUNC, ERR_INVALID_PARAMS, \
     ERR_FUNC_EXCEPTION, ERR_INVALID_JSON
-from sideboard.server import jsonrpc_reset
 from sideboard.websockets import trigger_delayed_notifications
 
 from uber.config import c, Config
@@ -326,5 +325,5 @@ def register_jsonrpc(service, name=None):
     jsonrpc_services[name] = service
 
 
-jsonrpc_app = _make_jsonrpc_handler(jsonrpc_services, precall=jsonrpc_reset)
-cherrypy.tree.mount(jsonrpc_app, os.path.join(c.CHERRYPY_MOUNT_PATH, 'jsonrpc'), c.APPCONF)
+jsonrpc_app = _make_jsonrpc_handler(jsonrpc_services)
+cherrypy.tree.mount(jsonrpc_app, c.CHERRYPY_MOUNT_PATH + '/jsonrpc', c.APPCONF)