From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 5 Jan 2010 15:00:18 +0000 (+0000)
Subject: read config from the python file and provide a default
X-Git-Tag: sfa-0.9-7~3
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=caee477975e3ccc88cefacb0b6e3cf4bbe2c2f46

read config from the python file and provide a default
---

diff --git a/sfa/util/config.py b/sfa/util/config.py
index a61ce3d4..d7723469 100644
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -28,7 +28,7 @@ class Config:
     fast but no type conversions.
     """
 
-    def __init__(self, config_file = "/etc/sfa/sfa_config"):
+    def __init__(self, config_file = "/etc/sfa/sfa_config.py"):
         self.config_file = None
         self.config_path = None
         self.data_path = None
@@ -54,6 +54,9 @@ class Config:
                 # default to /var/lib/sfa not specified in config
                 self.SFA_CONFIG_DIR="/etc/sfa"
 
+            if not hasattr(self, 'SFA_REGISTRY_LEVEL1_AUTH'):
+                self.SFA_REGISTRY_LEVEL1_AUTH=None
+
             # define interface types
             # this will determine which manager to use
             if not hasattr(self, 'SFA_REGISTRY_TYPE'):