Looks like that in the recent release of util-vserver, these variables cannot be...

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

diff --git a/sfa/util/config.py b/sfa/util/config.py
index fba98d1..02ad5d3 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -40,10 +40,15 @@ 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
@@ -60,7 +65,7 @@ class Config:
             if not hasattr(self, 'SFA_SM_TYPE'):
                 self.SFA_SM_TYPE='pl'
 
-            if not hasattr(self, 'SFA_COMPONENT_TYPE'):
+            if not hasattr(self, 'SFA_CM_TYPE'):
                 self.SFA_COMPONENT_TYPE='pl'
 
             # create the data directory if it doesnt exist