read config from the python file and provide a default

[sfa.git] / sfa / util / config.py

diff --git a/sfa/util/config.py b/sfa/util/config.py
index e5d3eb3..d772346 100644 (file)
--- 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
@@ -40,16 +40,23 @@ class Config:
             self.config_file = config_file
             # path to configuration data
             self.config_path = os.path.dirname(config_file)
+            
             # path to server data
             if not hasattr(self, 'SFA_DATA_DIR'):
                 # default to /var/lib/sfa not specified in config
                 self.SFA_DATA_DIR="/var/lib/sfa"
                 self.data_path = self.SFA_DATA_DIR
+            else:
+                self.data_path = self.SFA_DATA_DIR
+                
             # path to config data
             if not hasattr(self, 'SFA_CONFIG_DIR'):
                 # 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'):
@@ -66,7 +73,9 @@ class Config:
 
             # create the data directory if it doesnt exist
             if not os.path.isdir(self.SFA_DATA_DIR):
-                os.mkdir(self.SFA_DATA_DIR)
+                try:
+                    os.mkdir(self.SFA_DATA_DIR)
+                except: pass
              
         except IOError, e:
             raise IOError, "Could not find the configuration file: %s" % config_file