In configure we do not need to set_config()

[cascardo/ipsilon.git] / ipsilon / ipsilon

diff --git a/ipsilon/ipsilon b/ipsilon/ipsilon
index 8cabc85..094a09d 100755 (executable)
--- a/ipsilon/ipsilon
+++ b/ipsilon/ipsilon
@@ -23,10 +23,11 @@ import glob
 import os
 import atexit
 import cherrypy
-from ipsilon.util.data import Store
+from ipsilon.util.data import AdminStore
 from ipsilon.util import page
 from ipsilon.root import Root
 from jinja2 import Environment, FileSystemLoader
+import ipsilon.util.sessions
 
 
 def nuke_session_locks():
@@ -51,16 +52,21 @@ elif os.path.isfile('/etc/ipsilon/ipsilon.conf'):
 else:
     raise IOError("Configuration file not found")
 
+cherrypy.lib.sessions.SqlSession = ipsilon.util.sessions.SqlSession
 cherrypy.config.update(cfgfile)
 
 nuke_session_locks()
 
-datastore = Store()
-admin_config = datastore.get_admin_config()
+datastore = AdminStore()
+admin_config = datastore.load_config()
 for option in admin_config:
     cherrypy.config[option] = admin_config[option]
 
-templates = os.path.join(cherrypy.config['base.dir'], 'templates')
+template_dir = cherrypy.config.get('template_dir', 'templates')
+if template_dir.startswith('/'):
+    templates = template_dir
+else:
+    templates = os.path.join(cherrypy.config['base.dir'], template_dir)
 template_env = Environment(loader=FileSystemLoader(templates))
 
 if __name__ == "__main__":