X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.py;h=a56fb476f1fc605354366dce207239f4535436bb;hb=48a73b18fd7daed13c645c1adeddb57b560e7a2d;hp=6288bf7be55c303dcb78356b19cb9940ba190b4f;hpb=e4ae4a48f2717dd90768340d0f27bfb1b1e76156;p=nodemanager.git

diff --git a/config.py b/config.py
index 6288bf7..a56fb47 100644
--- a/config.py
+++ b/config.py
@@ -6,8 +6,8 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
+
+import os
 
 class Config:
     """
@@ -17,17 +17,31 @@ class Config:
 
     def __init__(self, file = "/etc/planetlab/plc_config"):
         try:
-            execfile(file, self.__dict__)
+            exec(compile(open(file).read(), file, 'exec'), self.__dict__)
         except:
-            raise Exception, "Could not parse " + file
+            raise Exception("Could not parse " + file)
 
         if int(self.PLC_API_PORT) == 443:
             uri = "https://"
+            if hasattr(self, 'PLC_API_CA_SSL_CRT'):
+                self.cacert = self.PLC_API_CA_SSL_CRT
+            elif os.path.exists('/usr/boot/cacert.pem'):
+                self.cacert = '/usr/boot/cacert.pem'
+            else:
+                raise Exception("No boot server certificate bundle available")
         else:
             uri = "http://"
+            self.cacert = None
 
         uri += self.PLC_API_HOST + \
                ":" + str(self.PLC_API_PORT) + \
                "/" + self.PLC_API_PATH + "/"
 
         self.plc_api_uri = uri
+
+
+if __name__ == '__main__':
+    from pprint import pprint
+    for (k, v) in Config().__dict__.items():
+        if k not in ['__builtins__']:
+            pprint ( (k, v), )