Applying a variant on Brenton's patch for DNS issues.

1 files changed, 9 insertions, 1 deletions

diff --git a/func/certmaster.py b/func/certmaster.py
index 1cde806..fdb34b8 100755
--- a/func/certmaster.py
+++ b/func/certmaster.py
@@ -36,7 +36,15 @@ CERTMASTER_LISTEN_PORT = 51235
 class CertMaster(object):
     def __init__(self, conf_file):
         self.cfg = read_config(conf_file, CMConfig)
-        mycn = '%s-CA-KEY' % socket.getfqdn()
+
+        fqdn = socket.getfqdn()
+        host = socket.gethostname()
+        if fdqn.find(host) != -1:
+            usename = fqdn
+        else: 
+            usename = host
+
+        mycn = '%s-CA-KEY' % usename
         self.ca_key_file = '%s/funcmaster.key' % self.cfg.cadir
         self.ca_cert_file = '%s/funcmaster.crt' % self.cfg.cadir
         try: