minion.conf,config_data.py: add certmaster and cert_dir config

utils.py: make it use the config object

3 files changed, 13 insertions, 12 deletions

diff --git a/minion/config_data.py b/minion/config_data.py
index 7007e4d..be4f164 100755
--- a/minion/config_data.py
+++ b/minion/config_data.py
@@ -43,7 +43,9 @@ class Config:
         
         self.ds["log_level"] = cp.get("general","log_level")
         self.ds["overlord_server"] = cp.get("general","overlord_server")
-
+        self.ds["certmaster"] = cp.get("general", "certmaster")
+        self.ds["cert_dir"] = cp.get("general", "cert_dir")
+        
     def get(self):
         return self.ds
 
diff --git a/minion/server.py b/minion/server.py
index 302bf43..994003b 100755
--- a/minion/server.py
+++ b/minion/server.py
@@ -155,16 +155,14 @@ class FuncSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer,
                           XmlRpcInterface):
     def __init__(self, args):
         self.allow_reuse_address = True
-        # is this right?
-        hn = socket.getfqdn()
-        self.key = "/etc/pki/func/%s.pem" % hn
-        self.cert = "/etc/pki/func/%s.cert" % hn
-        self.ca = "/etc/pki/func/ca.cert"
-
         self.modules = module_loader.load_modules()
-
         
         XmlRpcInterface.__init__(self)
+        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']
+        
         AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, ("", 51234),
                                                           self.key, self.cert,
                                                           self.ca)
diff --git a/minion/utils.py b/minion/utils.py
index 8b9069c..307141f 100755
--- a/minion/utils.py
+++ b/minion/utils.py
@@ -22,14 +22,15 @@ import codes
 import socket
 import time
 
-#import config_data
+import config_data
 
 
 
 def create_minion_keys():
-    #config_obj = config_data.Config()
-    cert_dir = '/etc/pki/func' # clearly needs to be a config
-    master_uri = 'http://certmaster:51235/' # clearly needs to be a config
+    config_obj = config_data.Config()
+    config = config_obj.get()
+    cert_dir = config['cert_dir']
+    master_uri = config['certmaster']
     hn = socket.getfqdn()
    
     key_file = '%s/%s.pem' % (cert_dir, hn)