summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2013-12-12 14:24:01 -0500
committerSimo Sorce <simo@redhat.com>2013-12-13 21:57:39 -0500
commite9aa502366c570e2ec7bf9f8630ffbab7984e4dd (patch)
tree20f3f73172126c86caf7715e4ffe157cf269ae8b
parent530a17cc2753ccda679246e73c31a4ffafd73dcb (diff)
downloadipsilon-e9aa502366c570e2ec7bf9f8630ffbab7984e4dd.zip
ipsilon-e9aa502366c570e2ec7bf9f8630ffbab7984e4dd.tar.gz
ipsilon-e9aa502366c570e2ec7bf9f8630ffbab7984e4dd.tar.xz
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>
-rw-r--r--.gitignore1
-rw-r--r--examples/ipsilon.conf3
-rwxr-xr-xsrc/ipsilon.py2
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})