summaryrefslogtreecommitdiffstats
path: root/certs
diff options
context:
space:
mode:
authorSeth Vidal <skvidal@fedoraproject.org>2007-09-21 10:27:37 -0400
committerSeth Vidal <skvidal@fedoraproject.org>2007-09-21 10:27:37 -0400
commitf945d9b43021fccde0544d4580778ae13ca50e22 (patch)
tree29e7ded65b09b6114fdc0a79e2952f708b42584a /certs
parent09564271ee24d4a6a9ff1aa09e52de33b7756985 (diff)
downloadthird_party-func-f945d9b43021fccde0544d4580778ae13ca50e22.tar.gz
third_party-func-f945d9b43021fccde0544d4580778ae13ca50e22.tar.xz
third_party-func-f945d9b43021fccde0544d4580778ae13ca50e22.zip
fix up a couple of bugs - verify that creating keys/csrs/certs is working
Diffstat (limited to 'certs')
-rw-r--r--certs/slave-keys.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/certs/slave-keys.py b/certs/slave-keys.py
index e1f6a45..00ed81f 100644
--- a/certs/slave-keys.py
+++ b/certs/slave-keys.py
@@ -18,6 +18,8 @@
import sys
import os
import os.path
+from exceptions import Exception
+
import func.certs
cert_dir = '/etc/pki/func'
@@ -34,12 +36,13 @@ def main():
if not os.path.exists(cert_dir):
os.makedirs(cert_dir)
if not os.path.exists(key_file):
- keypair = func.certs.make_cert(dest=key_file)
+ keypair = func.certs.make_keypair(dest=key_file)
if not os.path.exists(csr_file):
if not keypair:
keypair = func.certs.retrieve_key_from_file(key_file)
csr = func.certs.make_csr(keypair, dest=csr_file)
- except: # need a little more specificity here
+ except Exception, e: # need a little more specificity here
+ print e
return 1
return 0