diff options
author | Adrian Likins <alikins@redhat.com> | 2007-09-28 12:46:56 -0400 |
---|---|---|
committer | Adrian Likins <alikins@redhat.com> | 2007-09-28 12:46:56 -0400 |
commit | ac9a10988af2c3ddcc36c8c0f91837d499410d65 (patch) | |
tree | 20d2ffb20062c8bb19f5651e84ce15665f16bddb | |
parent | 77c539f2e0f50f53a9fea868f85c2e512e9a6eda (diff) | |
parent | 0678c2d8107dbb5eaa7c4c7dbb97c9db3064b69a (diff) | |
download | func-ac9a10988af2c3ddcc36c8c0f91837d499410d65.tar.gz func-ac9a10988af2c3ddcc36c8c0f91837d499410d65.tar.xz func-ac9a10988af2c3ddcc36c8c0f91837d499410d65.zip |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
-rwxr-xr-x | func/certmaster.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/func/certmaster.py b/func/certmaster.py index 0c1f333..bcff926 100755 --- a/func/certmaster.py +++ b/func/certmaster.py @@ -24,6 +24,7 @@ import os.path from OpenSSL import crypto import sha import glob +import socket #from func.server import codes import certs @@ -35,13 +36,14 @@ from commonconfig import CMConfig class CertMaster(object): def __init__(self, conf_file): self.cfg = read_config(conf_file, CMConfig) + mycn = '%s-CA-KEY' % socket.getfqdn() self.ca_key_file = '%s/funcmaster.key' % self.cfg.cadir self.ca_cert_file = '%s/funcmaster.crt' % self.cfg.cadir try: if not os.path.exists(self.cfg.cadir): os.makedirs(self.cfg.cadir) if not os.path.exists(self.ca_key_file) and not os.path.exists(self.ca_cert_file): - certs.create_ca(ca_key_file=self.ca_key_file, ca_cert_file=self.ca_cert_file) + certs.create_ca(CN=mycn, ca_key_file=self.ca_key_file, ca_cert_file=self.ca_cert_file) except (IOError, OSError), e: print 'Cannot make certmaster certificate authority keys/certs, aborting: %s' % e sys.exit(1) |