summaryrefslogtreecommitdiffstats
path: root/overlord/sslclient.py
diff options
context:
space:
mode:
Diffstat (limited to 'overlord/sslclient.py')
-rw-r--r--overlord/sslclient.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/overlord/sslclient.py b/overlord/sslclient.py
index 463b8c6..2d2f38e 100644
--- a/overlord/sslclient.py
+++ b/overlord/sslclient.py
@@ -1,10 +1,12 @@
#!/usr/bin/python
+import socket
import sys
import xmlrpclib
import urllib
from func import SSLCommon
+from func import config_data
class SSL_Transport(xmlrpclib.Transport):
@@ -35,10 +37,15 @@ class SSLXMLRPCServerProxy(xmlrpclib.ServerProxy):
class FuncServer(SSLXMLRPCServerProxy):
- def __init__(self, uri):
- self.pem = "/etc/pki/func/slave.pem"
- self.crt = "/etc/pki/func/slave.cert"
- self.ca = "/etc/pki/func/ca/funcmaster.crt"
+ def __init__(self, uri, pem=None, crt=None, ca=None):
+
+ config_obj = config_data.Config()
+ self.config = config_obj.get()
+
+ hn = socket.getfqdn()
+ self.key = "%s/%s.pem" % (self.config['cert_dir'], hn)
+ self.cert = "%s/%s.cert" % (self.config['cert_dir'], hn)
+ self.ca = "%s/ca.cert" % self.config['cert_dir']
SSLXMLRPCServerProxy.__init__(self, uri,
self.pem,