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 <simo@redhat.com>

diff --git a/.gitignore b/.gitignore
index 8472a71..7b09dcd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ dist/
 MANIFEST
 *.pyc
 *.pyo
 MANIFEST
 *.pyc
 *.pyo

+ipsilon.conf

diff --git a/examples/ipsilon.conf b/examples/ipsilon.conf
index d536d96..dc45a1b 100644 (file)
--- a/examples/ipsilon.conf
+++ b/examples/ipsilon.conf
@@ -1,5 +1,4 @@
 [global]
 [global]

-log.iscreen = "error"
+log.screen = True

 base.dir = "../"
 base.dir = "../"

-providers.dir = "../src/providers"

 admin.config.db = "/var/lib/ipsilon/adminconfig.sqlite"
 admin.config.db = "/var/lib/ipsilon/adminconfig.sqlite"

diff --git a/src/ipsilon.py b/src/ipsilon.py
index 20c2c66..84a9a31 100755 (executable)
--- a/src/ipsilon.py
+++ b/src/ipsilon.py
@@ -32,7 +32,7 @@ import root
 
 cherrypy.config.update('ipsilon.conf')
 
 
 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})
 
 idp_providers = plugins.get_providers()
 cherrypy.config.update({'idp_providers': idp_providers})