diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rwxr-xr-x | func/certmaster.py | 10 | ||||
| -rw-r--r-- | func/certs.py | 7 |
3 files changed, 16 insertions, 2 deletions
@@ -15,6 +15,7 @@ Additional patches and contributions by ... John Eckersberg <jeckersb@redhat.com> Scott Henson <shenson@redhat.com> Vito Laurenza <vitolaurenza@gmail.com> + Brenton Leanhardt <bleanhar@redhat.com> Luke Macken <lmacken@redhat.com> Steve Milner <smilner@redhat.com> Stephen Nelson-Smith <atalanta.systems@googlemail.com> 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: diff --git a/func/certs.py b/func/certs.py index 22af866..810d17c 100644 --- a/func/certs.py +++ b/func/certs.py @@ -48,7 +48,12 @@ def make_csr(pkey, dest=None, cn=None): if cn: subj.CN = cn else: - subj.CN = socket.getfqdn() + fqdn = socket.getfqdn() + host = socket.gethostname() + if fdqn.find(host) != -1: + subj.CN = fqdn + else: + subj.CN = host subj.emailAddress = 'root@%s' % subj.CN req.set_pubkey(pkey) |