From e9aa502366c570e2ec7bf9f8630ffbab7984e4dd Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 12 Dec 2013 14:24:01 -0500 Subject: [PATCH] Fix settings Fix logging to use right name and value Make all option relative to the base of the tree. Signed-off-by: Simo Sorce --- .gitignore | 1 + examples/ipsilon.conf | 3 +-- src/ipsilon.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8472a71..7b09dcd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ dist/ MANIFEST *.pyc *.pyo +ipsilon.conf diff --git a/examples/ipsilon.conf b/examples/ipsilon.conf index d536d96..dc45a1b 100644 --- a/examples/ipsilon.conf +++ b/examples/ipsilon.conf @@ -1,5 +1,4 @@ [global] -log.iscreen = "error" +log.screen = True base.dir = "../" -providers.dir = "../src/providers" admin.config.db = "/var/lib/ipsilon/adminconfig.sqlite" diff --git a/src/ipsilon.py b/src/ipsilon.py index 20c2c66..84a9a31 100755 --- a/src/ipsilon.py +++ b/src/ipsilon.py @@ -32,7 +32,7 @@ import root cherrypy.config.update('ipsilon.conf') -plugins = plugin.Plugins() +plugins = plugin.Plugins(path=cherrypy.config['base.dir']) idp_providers = plugins.get_providers() cherrypy.config.update({'idp_providers': idp_providers}) -- 2.20.1