--- a/annot-server/annotserver.py	Fri Oct 10 17:08:31 2014 +0200
+++ b/annot-server/annotserver.py	Mon Oct 13 12:43:47 2014 +0200
@@ -12,6 +12,7 @@
 from twisted.web.wsgi import WSGIResource
 from twisted.web.static import Data, File
 
+import config
 from oscserver import OSCServerProtocol
 from websockets import BroadcastServerFactory, AnotationServerFactory
 from webapp import app
@@ -21,7 +22,7 @@
 WS_PORT = 8090
 OSC_PORT = 9090
 
-def make_service(config, conn, debug=False):
+def make_service(conn, debug=False):
 
     s = service.MultiService()
     # Create and start a thread pool,
@@ -32,14 +33,14 @@
     reactor.addSystemEventTrigger('after', 'shutdown', wsgiThreadPool.stop)
 
 
-    wsFactory = BroadcastServerFactory("ws://localhost:%d/broadcast" % config.get('ws_port',WS_PORT),
+    wsFactory = BroadcastServerFactory("ws://localhost:%d/broadcast" % getattr(config,'WS_PORT',WS_PORT),
                                        debug = debug,
                                        debugCodePaths = debug)
     wsFactory.setProtocolOptions(allowHixie76 = True)
     wsResource = WebSocketResource(wsFactory)
 
 
-    wsAnnotFactory = AnotationServerFactory("ws://localhost:%d/annot" % config.get('ws_port',WS_PORT),
+    wsAnnotFactory = AnotationServerFactory("ws://localhost:%d/annot" % getattr(config,'WS_PORT',WS_PORT),
                                        debug = debug,
                                        debugCodePaths = debug,
                                        ws_factory = wsFactory,
@@ -55,21 +56,21 @@
 
 
     webResource = resource.Resource()
-    webResource.putChild(config['static_url'], File(config['static_root']))
+    webResource.putChild(getattr(config,'STATIC_URL').lstrip('/'), File(getattr(config,'STATIC_ROOT')))
     # Create the WSGI resource
     wsgiAppAsResource = WSGIResource(reactor, wsgiThreadPool, app)
-    webResource.putChild('', wsgiAppAsResource)
+    webResource.putChild('p', wsgiAppAsResource)
 
 
     # Hooks for twistd
 
-    webserver = strports.service('tcp:%d' % config.get('web_port',WEB_PORT), server.Site(webResource))
+    webserver = strports.service('tcp:%d' % getattr(config,'WEB_PORT',WEB_PORT), server.Site(webResource))
     webserver.setServiceParent(s)
 
-    wsserver = strports.service('tcp:%d' % config.get('ws_port',WS_PORT), server.Site(rootWs))
+    wsserver = strports.service('tcp:%d' % getattr(config,'WS_PORT',WS_PORT), server.Site(rootWs))
     wsserver.setServiceParent(s)
 
-    oscservice = internet.UDPServer(config.get('osc_port',OSC_PORT), OSCServerProtocol(wsFactory, conn))
+    oscservice = internet.UDPServer(getattr(config,'OSC_PORT',OSC_PORT), OSCServerProtocol(wsFactory, conn))
     oscservice.setServiceParent(s)
 
     return s