Create database upgrade framework

[cascardo/ipsilon.git] / ipsilon / ipsilon

diff --git a/ipsilon/ipsilon b/ipsilon/ipsilon
index a0cc158..8264bce 100755 (executable)
--- a/ipsilon/ipsilon
+++ b/ipsilon/ipsilon
@@ -8,6 +8,7 @@ import glob
 import os
 import atexit
 import cherrypy
+from ipsilon import find_config
 from ipsilon.util.data import AdminStore
 from ipsilon.util import page
 from ipsilon.root import Root
@@ -27,15 +28,7 @@ def nuke_session_locks():
         except Exception:  # pylint: disable=broad-except
             pass
 
-cfgfile = None
-if (len(sys.argv) > 1):
-    cfgfile = sys.argv[-1]
-elif os.path.isfile('ipsilon.conf'):
-    cfgfile = 'ipsilon.conf'
-elif os.path.isfile('/etc/ipsilon/ipsilon.conf'):
-    cfgfile = '/etc/ipsilon/ipsilon.conf'
-else:
-    raise IOError("Configuration file not found")
+cfgfile = find_config()
 
 cherrypy.lib.sessions.SqlSession = ipsilon.util.sessions.SqlSession
 cherrypy.config.update(cfgfile)
@@ -60,7 +53,9 @@ else:
 template_loaders.append(FileSystemLoader(
     os.path.join(cherrypy.config['base.dir'],
                  default_template_dir)))
-template_env = Environment(loader=ChoiceLoader(template_loaders))
+template_env = Environment(loader=ChoiceLoader(template_loaders),
+                           autoescape=True,
+                           extensions=['jinja2.ext.autoescape'])
 
 if __name__ == "__main__":
     conf = {'/': {'tools.staticdir.root': os.getcwd()},