X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=blobdiff_plain;f=scripts%2Fcertmaster-sync;h=4d9559ffe7f06c9693d7ce165b7487c08a209c50;hp=fd1db93defa429c4319a06745e08d8f24b72e49c;hb=1b1b6f5733d65cbb73f48ac9b4419aba3dc00eee;hpb=fbd4bc1fe300150b55255d5af80052601dfbcd77 diff --git a/scripts/certmaster-sync b/scripts/certmaster-sync index fd1db93..4d9559f 100644 --- a/scripts/certmaster-sync +++ b/scripts/certmaster-sync @@ -79,8 +79,9 @@ def local_certs(): results = [] for f in files: hostname = os.path.basename(f).replace('.' + cm.cfg.cert_extension, '') + dirname = os.path.dirname(f) digest = checksum(f) - results.append([hostname, digest]) + results.append([hostname, digest, dirname]) return results def checksum(f): @@ -119,7 +120,7 @@ def copy_updated_certs(local, remote): for cert in local: if cert not in peers: cert_name = '%s.%s' % (cert[0], cm.cfg.cert_extension) - full_path = os.path.join(cm.cfg.certroot, cert_name) + full_path = os.path.join(cert[2], cert_name) fd = open(full_path) certblob = fd.read() fd.close()