pam: use a pam object method instead of pam module function

[cascardo/ipsilon.git] / ipsilon / ipsilon

diff --git a/ipsilon/ipsilon b/ipsilon/ipsilon
index bec13af..db82e7a 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,19 +28,15 @@ 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)
 
+# Force cherrypy logging to work. Note that this ignores the config-file
+# setting.
+cherrypy.log.screen = True
+
 nuke_session_locks()
 
 datastore = AdminStore()
@@ -67,7 +64,9 @@ template_env = Environment(loader=ChoiceLoader(template_loaders),
 if __name__ == "__main__":
     conf = {'/': {'tools.staticdir.root': os.getcwd()},
             '/ui': {'tools.staticdir.on': True,
-                    'tools.staticdir.dir': 'ui'}}
+                    'tools.staticdir.dir': 'ui'},
+            '/cache': {'tools.staticdir.on': True,
+                       'tools.staticdir.dir': 'cache'}}
     cherrypy.quickstart(Root('default', template_env),
                         cherrypy.config['base.mount'], conf)