X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Fidpserver.py;h=beb1a921c788c523142bf0c3ae4bbbca2e4bb7be;hp=f9fb527c4dfa22a98c49bc1dbe737a64e57ecf39;hb=28a9f2009c5a418271bc101ce775c4204c9de2e3;hpb=e47edacd7eb7f4c90a244aed7313d07eaac08875

diff --git a/ipsilon/idpserver.py b/ipsilon/idpserver.py
index f9fb527..beb1a92 100755
--- a/ipsilon/idpserver.py
+++ b/ipsilon/idpserver.py
@@ -28,7 +28,17 @@ from ipsilon.util import page
 from ipsilon.root import Root
 from jinja2 import Environment, FileSystemLoader
 
-cherrypy.config.update('ipsilon.conf')
+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")
+
+cherrypy.config.update(cfgfile)
 
 datastore = Store()
 admin_config = datastore.get_admin_config()