valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #35305 from choffman/prepend_cn

Browse Source 
Option to prepend the CN to the copypath filename
This commit is contained in:
Mike Place 2016-08-10 20:41:50 +09:00 committed by GitHub
commit 4fb6436c4e
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/modules/x509.py
View File

@ -1209,6 +1209,12 @@ def create_certificate(
An additional path to copy the resulting certificate to. Can be used
to maintain a copy of all certificates issued for revocation purposes.
prepend_cn:
If set to True, the CN and a dash will be prepended to the copypath's filename.
Example:
/etc/pki/issued_certs/www.example.com-DE:CA:FB:AD:00:00:00:00.crt
signing_policy:
A signing policy that should be used to create this certificate.
Signing policies should be defined in the minion configuration, or in
@ -1414,13 +1420,13 @@ def create_certificate(
'failed to verify certificate signature')
if 'copypath' in kwargs:
write_pem(
text=cert.as_pem(),
path=os.path.join(
kwargs['copypath'], kwargs['serial_number'] + '.crt'),
overwrite=overwrite,
pem_type='CERTIFICATE'
)
if 'prepend_cn' in kwargs and kwargs['prepend_cn'] is True:
prepend = str(kwargs['CN']) + '-'
else:
prepend = ''
write_pem(text=cert.as_pem(), path=os.path.join(kwargs['copypath'],
prepend + kwargs['serial_number']+'.crt'),
pem_type='CERTIFICATE')
if path:
return write_pem(