From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 6 Jul 2009 21:15:28 +0000 (+0000)
Subject: fix path for authorities
X-Git-Tag: sfa-0.9-0@14641~141
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=35223274b6932bdf672bb792ca48fb4552c88f83;p=sfa.git

fix path for authorities
---

diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index 066ed65c..968324e4 100644
--- a/sfa/server/sfa-server.py
+++ b/sfa/server/sfa-server.py
@@ -44,7 +44,6 @@ from sfa.server.registry import Registry
 from sfa.server.aggregate import Aggregate
 from sfa.server.slicemgr import SliceMgr
 
-from sfa.util.config import Config
 from sfa.trust.hierarchy import Hierarchy
 
 # after http://www.erlenstar.demon.co.uk/unix/faq_2.html
@@ -83,10 +82,10 @@ def main():
          help="Run as daemon.", default=False)
     (options, args) = parser.parse_args()
 
-    config = Config()
-    path = config.basepath 
-    key_file = path + os.sep + "server.key"
-    cert_file = path + os.sep + "server.cert"
+    hierarchy = Hierarchy()
+    path = hierarchy.basedir
+    key_file = os.path.join(path, "server.key")
+    cert_file = os.path.join(path, "server.cert")
     
     if (options.daemon):  daemon()
 
diff --git a/sfa/trust/hierarchy.py b/sfa/trust/hierarchy.py
index abb2328d..59007939 100644
--- a/sfa/trust/hierarchy.py
+++ b/sfa/trust/hierarchy.py
@@ -111,7 +111,7 @@ class Hierarchy:
     def __init__(self, basedir = None):
         if not basedir:
             config = Config()
-            basedir = config.config_path + os.sep + "authorities"
+            basedir = os.path.join(config.config_path, "authorities")
         self.basedir = basedir
     ##
     # Given a hrn, return the filenames of the GID, private key, and dbinfo