Fix default and example paths

Signed-off-by: Simo Sorce <simo@redhat.com>

diff --git a/examples/apache.conf b/examples/apache.conf
index 1347916..35693f5 100644 (file)
--- a/examples/apache.conf
+++ b/examples/apache.conf
@@ -1,6 +1,6 @@
-Alias /idp/ui /var/www/idp/ipsilon/ui
-WSGIScriptAlias /idp /var/www/idp/ipsilon/ipsilon/idpserver.py
-WSGIDaemonProcess idp python-path=/var/www/idp/ipsilon/ipsilon home=/var/www/idp/ipsilon/ipsilon maximum-requests=2 user=ipsilon group=ipsilon
+Alias /idp/ui /usr/share/ipsilon/ui
+WSGIScriptAlias /idp /usr/sbin/ipsilon.py
+WSGIDaemonProcess idp maximum-requests=2 user=ipsilon group=ipsilon

 WSGIProcessGroup idp
 
 <Location /idp/login/krb/negotiate>
 WSGIProcessGroup idp
 
 <Location /idp/login/krb/negotiate>


@@ -19,8 +19,9 @@ WSGIProcessGroup idp
   ErrorDocument 401 /idp/login/krb/unauthorized
 </Location>
 
   ErrorDocument 401 /idp/login/krb/unauthorized
 </Location>
 

-<Directory /idp>
+<Directory /usr/sbin>

     Order allow,deny
     Allow from all
     Order allow,deny
     Allow from all

+    Require all granted

 </Directory>
 
 </Directory>
 

diff --git a/examples/ipsilon.conf b/examples/ipsilon.conf
index 0f8e445..d1755c2 100644 (file)
--- a/examples/ipsilon.conf
+++ b/examples/ipsilon.conf
@@ -3,7 +3,7 @@ debug = True
 
 log.screen = True
 base.mount = "/idp"
 
 log.screen = True
 base.mount = "/idp"

-base.dir = "../"
+base.dir = "/usr/share/ipsilon"

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

diff --git a/ipsilon/idpserver.py b/ipsilon/idpserver.py
index beb1a92..9fa370e 100755 (executable)
--- a/ipsilon/idpserver.py
+++ b/ipsilon/idpserver.py
@@ -54,7 +54,8 @@ if __name__ == "__main__":
     conf = {'/': {'tools.staticdir.root': os.getcwd()},
             '/ui': {'tools.staticdir.on': True,
                     'tools.staticdir.dir': 'ui'}}
     conf = {'/': {'tools.staticdir.root': os.getcwd()},
             '/ui': {'tools.staticdir.on': True,
                     'tools.staticdir.dir': 'ui'}}

-    cherrypy.quickstart(Root('default', template_env), '/', conf)
+    cherrypy.quickstart(Root('default', template_env),
+                        cherrypy.config['base.mount'], conf)

 
 else:
     cherrypy.config['environment'] = 'embedded'
 
 else:
     cherrypy.config['environment'] = 'embedded'

diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py
index 045cc75..5a517e4 100755 (executable)
--- a/ipsilon/util/plugin.py
+++ b/ipsilon/util/plugin.py
@@ -26,11 +26,7 @@ from ipsilon.util.data import Store
 
 class Plugins(object):
 
 
 class Plugins(object):
 

-    def __init__(self, path=None):
-        if path is None:
-            self._path = os.getcwd()
-        else:
-            self._path = path
+    def __init__(self):

         self._providers_tree = None
 
     def _load_class(self, tree, class_type, file_name):
         self._providers_tree = None
 
     def _load_class(self, tree, class_type, file_name):


@@ -83,7 +79,7 @@ class PluginLoader(object):
         if config is None:
             config = dict()
 
         if config is None:
             config = dict()
 

-        p = Plugins(path=cherrypy.config['base.dir'])
+        p = Plugins()

         (pathname, dummy) = os.path.split(inspect.getfile(baseobj))
         self._plugins = {
             'config': config,
         (pathname, dummy) = os.path.split(inspect.getfile(baseobj))
         self._plugins = {
             'config': config,