diff options
Diffstat (limited to 'ipsilon/main.py')
| -rwxr-xr-x | ipsilon/main.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ipsilon/main.py b/ipsilon/main.py index 3f3043b..dd8fd12 100755 --- a/ipsilon/main.py +++ b/ipsilon/main.py @@ -22,17 +22,15 @@ sys.stdout = sys.stderr import os import atexit -import threading import cherrypy -from login import common -from util import data -from util import page +from ipsilon.util.data import Store +import ipsilon.util.page as page from jinja2 import Environment, FileSystemLoader -import root +from ipsilon.root import Root cherrypy.config.update('ipsilon.conf') -datastore = data.Store() +datastore = Store() admin_config = datastore.get_admin_config() for option in admin_config: cherrypy.config[option] = admin_config[option] @@ -47,7 +45,7 @@ if __name__ == "__main__": '/ui': { 'tools.staticdir.on': True, 'tools.staticdir.dir': 'ui' } } - cherrypy.quickstart(root.Root('default', template_env), '/', conf) + cherrypy.quickstart(Root('default', template_env), '/', conf) else: cherrypy.config['environment'] = 'embedded' @@ -56,5 +54,5 @@ else: cherrypy.engine.start(blocking=False) atexit.register(cherrypy.engine.stop) - application = cherrypy.Application(root.Root('default', template_env), + application = cherrypy.Application(Root('default', template_env), script_name=None, config=None) |