saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

salt should pass numbers appropriately, but just in case

Browse source
This commit is contained in:
Clint Savage 2012-10-02 08:34:40 -06:00
parent f9efcffbf4
commit 28ee396aa1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/ca.py
View file

@ -11,7 +11,7 @@ REQUIREMENT 2:
Add the following values in /etc/salt/minion for the
CA module to function properly::
ca.cert_base_path: '/etc/pki/koji'
ca.cert_base_path: '/etc/pki'
'''
# Import Python libs
@ -164,7 +164,7 @@ def create_ca(
organization, default is "Salt Stack"
OU
organizational unit, default is None
email
emailAddress
email address for the CA owner, default is 'xyz@pdq.net'
Writes out a CA certificate based upon defined config values. If the file
@ -202,7 +202,7 @@ def create_ca(
ca.get_subject().emailAddress = emailAddress
ca.gmtime_adj_notBefore(0)
ca.gmtime_adj_notAfter(days * 24 * 60 * 60)
ca.gmtime_adj_notAfter(int(days) * 24 * 60 * 60)
ca.set_issuer(ca.get_subject())
ca.set_pubkey(key)
@ -438,7 +438,7 @@ def create_ca_signed_cert(ca_name, CN, days=365):
cert = OpenSSL.crypto.X509()
cert.set_subject(req.get_subject())
cert.gmtime_adj_notBefore(0)
cert.gmtime_adj_notAfter(days * 24 * 60 * 60)
cert.gmtime_adj_notAfter(int(days) * 24 * 60 * 60)
cert.set_serial_number(_new_serial(ca_name, CN))
cert.set_issuer(ca_cert.get_subject())
cert.set_pubkey(req.get_pubkey())