projects
/
certmaster.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to allow us to specify the hostname we want to use for cert creation,
[certmaster.git]
/
certmaster
/
certs.py
diff --git
a/certmaster/certs.py
b/certmaster/certs.py
index
8a1db3a
..
554822e
100644
(file)
--- a/
certmaster/certs.py
+++ b/
certmaster/certs.py
@@
-37,7
+37,7
@@
def make_keypair(dest=None):
return pkey
return pkey
-def make_csr(pkey, dest=None, cn=None):
+def make_csr(pkey, dest=None, cn=None
, hostname=None
):
req = crypto.X509Req()
req.get_subject()
subj = req.get_subject()
req = crypto.X509Req()
req.get_subject()
subj = req.get_subject()
@@
-48,8
+48,11
@@
def make_csr(pkey, dest=None, cn=None):
subj.OU = def_ou
if cn:
subj.CN = cn
subj.OU = def_ou
if cn:
subj.CN = cn
+ elif hostname:
+ subj.CN = hostname
else:
else:
- subj.CN = utils.get_hostname()
+ subj.CN = utils.gethostname()
+
subj.emailAddress = 'root@%s' % subj.CN
req.set_pubkey(pkey)
subj.emailAddress = 'root@%s' % subj.CN
req.set_pubkey(pkey)