Implement login plugin infrastructure

[cascardo/ipsilon.git] / ipsilon / idpserver.py

diff --git a/ipsilon/idpserver.py b/ipsilon/idpserver.py
index 7a782d6..f9fb527 100755 (executable)
--- a/ipsilon/idpserver.py
+++ b/ipsilon/idpserver.py
@@ -22,37 +22,29 @@ sys.stdout = sys.stderr
 
 import os
 import atexit
-import threading
 import cherrypy
-from util import plugin
-from util import data
-from util import page
+from ipsilon.util.data import Store
+from ipsilon.util import page
+from ipsilon.root import Root
 from jinja2 import Environment, FileSystemLoader
-import root
 
 cherrypy.config.update('ipsilon.conf')
 
-plugins = plugin.Plugins(path=cherrypy.config['base.dir'])
-idp_providers = plugins.get_providers()
-if idp_providers:
-    cherrypy.config['idp_providers'] = idp_providers
-
-datastore = data.Store()
+datastore = Store()
 admin_config = datastore.get_admin_config()
 for option in admin_config:
     cherrypy.config[option] = admin_config[option]
 
-templates = os.path.join(cherrypy.config['base.dir'], 'templates')
-env = Environment(loader=FileSystemLoader(templates))
-
 cherrypy.tools.protect = cherrypy.Tool('before_handler', page.protect)
 
+templates = os.path.join(cherrypy.config['base.dir'], 'templates')
+template_env = Environment(loader=FileSystemLoader(templates))
+
 if __name__ == "__main__":
-    conf = { '/': {'tools.staticdir.root': os.getcwd()},
-             '/ui': { 'tools.staticdir.on': True,
-                      'tools.staticdir.dir': 'ui' }
-           }
-    cherrypy.quickstart(root.Root(env), '/', conf)
+    conf = {'/': {'tools.staticdir.root': os.getcwd()},
+            '/ui': {'tools.staticdir.on': True,
+                    'tools.staticdir.dir': 'ui'}}
+    cherrypy.quickstart(Root('default', template_env), '/', conf)
 
 else:
     cherrypy.config['environment'] = 'embedded'
@@ -61,5 +53,5 @@ else:
         cherrypy.engine.start(blocking=False)
         atexit.register(cherrypy.engine.stop)
 
-    application = cherrypy.Application(root.Root(env),
+    application = cherrypy.Application(Root('default', template_env),
                                        script_name=None, config=None)