Add Admin preferences system

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

diff --git a/src/ipsilon.py b/src/ipsilon.py
index affab32..15b0ec8 100755 (executable)
--- a/src/ipsilon.py
+++ b/src/ipsilon.py
@@ -24,6 +24,7 @@ import atexit
 import threading
 import cherrypy
 from util import plugin
+from util import data
 
 class Root(object):
 
@@ -32,10 +33,16 @@ class Root(object):
         return '/'
 
 
+cherrypy.config.update('ipsilon.conf')
+
 plugins = plugin.Plugins()
 idp_providers = plugins.get_providers()
 cherrypy.config.update({'idp_providers': idp_providers})
 
+datastore = data.Store()
+admin_config = datastore.get_admin_config()
+cherrypy.config.update(admin_config)
+
 if __name__ == "__main__":
     cherrypy.quickstart(Root())