git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add required helper function
[nodemanager.git]
/
config.py
diff --git
a/config.py
b/config.py
index
14ee71d
..
5b890de
100644
(file)
--- a/
config.py
+++ b/
config.py
@@
-6,9
+6,11
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id
: config.py,v 1.3 2006/10/31 23:15:12 mlhuang Exp
$
+# $Id$
#
#
+import os
+
class Config:
"""
Parses Python configuration files; all variables in the file are
class Config:
"""
Parses Python configuration files; all variables in the file are
@@
-23,8
+25,15
@@
class Config:
if int(self.PLC_API_PORT) == 443:
uri = "https://"
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://"
else:
uri = "http://"
+ self.cacert = None
uri += self.PLC_API_HOST + \
":" + str(self.PLC_API_PORT) + \
uri += self.PLC_API_HOST + \
":" + str(self.PLC_API_PORT) + \
@@
-32,6
+41,7
@@
class Config:
self.plc_api_uri = uri
self.plc_api_uri = uri
+
if __name__ == '__main__':
from pprint import pprint
pprint(Config().__dict__.items())
if __name__ == '__main__':
from pprint import pprint
pprint(Config().__dict__.items())