mostly merges of stuff I thought I had already committed and pushed

various s/func/certmaster changes

2 files changed, 9 insertions, 7 deletions

diff --git a/func/overlord/client.py b/func/overlord/client.py
index fdcf875..26b1cca 100755
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -17,7 +17,7 @@ import sys
 import glob
 import os
 
-from func.commonconfig import CMConfig
+from certmaster.commonconfig import CMConfig
 from func.config import read_config, CONFIG_FILE
 
 import sslclient
@@ -189,13 +189,15 @@ class Client(object):
           # certmaster key, cert, ca
           # funcd key, cert, ca
           # raise FuncClientError
-        ol_key = '%s/funcmaster.key' % self.config.cadir
-        ol_crt = '%s/funcmaster.crt' % self.config.cadir
+        ol_key = '%s/certmaster.key' % self.config.cadir
+        ol_crt = '%s/certmaster.crt' % self.config.cadir
         myname = utils.get_hostname()
+
+        # FIXME: should be config -akl?
         # maybe /etc/pki/func is a variable somewhere?
-        fd_key = '/etc/pki/func/%s.pem' % myname
-        fd_crt = '/etc/pki/func/%s.cert' % myname
-        self.ca = '%s/funcmaster.crt' % self.config.cadir
+        fd_key = '/etc/pki/certmaster/%s.pem' % myname
+        fd_crt = '/etc/pki/certmaster/%s.cert' % myname
+        self.ca = '%s/certmaster.crt' % self.config.cadir
         if client_key and client_cert and ca:        
             if (os.access(client_key, os.R_OK) and os.access(client_cert, os.R_OK)
                             and os.access(ca, os.R_OK)):
diff --git a/func/overlord/command.py b/func/overlord/command.py
index 7fb7de4..7cf3623 100644
--- a/func/overlord/command.py
+++ b/func/overlord/command.py
@@ -15,7 +15,7 @@ import optparse
 import sys
 
 from func.config import read_config, CONFIG_FILE
-from func.commonconfig import CMConfig
+from certmaster.commonconfig import CMConfig
 
 class CommandHelpFormatter(optparse.IndentedHelpFormatter):
     """