diff options
| author | Adrian Likins <alikins@redhat.com> | 2008-02-05 15:29:44 -0500 |
|---|---|---|
| committer | Adrian Likins <alikins@redhat.com> | 2008-02-05 15:29:44 -0500 |
| commit | d66c63d5bff25a1296e7a98301bef462c16d2a0c (patch) | |
| tree | abde3cab98b7ab1da1aa2a526fab2e65d981f40a /scripts | |
| parent | e9875ad4ccaa017e91e0528ec2753f1098218e79 (diff) | |
| parent | 8c7114e9c59419fb1ecce075e56c34e0198b8228 (diff) | |
| download | third_party-func-d66c63d5bff25a1296e7a98301bef462c16d2a0c.tar.gz third_party-func-d66c63d5bff25a1296e7a98301bef462c16d2a0c.tar.xz third_party-func-d66c63d5bff25a1296e7a98301bef462c16d2a0c.zip | |
Merge branch 'master' of ssh://alikins@git.fedorahosted.org/git/func
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/certmaster-ca | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/scripts/certmaster-ca b/scripts/certmaster-ca index 867bd04..b3e844a 100755 --- a/scripts/certmaster-ca +++ b/scripts/certmaster-ca @@ -46,7 +46,7 @@ def main(args): errorprint('Must be root to run certmaster-ca') return 1 - cm = func.certmaster.CertMaster('/etc/func/certmaster.conf') + cm = func.certmaster.CertMaster() (opts, args) = parseargs(args) @@ -84,17 +84,7 @@ def main(args): return 1 for hn in args: - csrglob = '%s/%s.csr' % (cm.cfg.csrroot, hn) - csrs = glob.glob(csrglob) - certglob = '%s/%s.cert' % (cm.cfg.certroot, hn) - certs = glob.glob(certglob) - if not csrs and not certs: - errorprint('No match for %s to clean up' % hn) - continue - - for fn in csrs + certs: - print 'Cleaning out %s for host matching %s' % (fn, hn) - os.unlink(fn) + cm.remove_this_host(hn) return 0 |