diff --git a/roles/tlscert_acme_inwx/files/tls-renew b/roles/tlscert_acme_inwx/files/tls-renew index db85e2e..84e22bf 100755 --- a/roles/tlscert_acme_inwx/files/tls-renew +++ b/roles/tlscert_acme_inwx/files/tls-renew @@ -101,38 +101,21 @@ def main(): _sys.stdout.write(command_certbot + "\n") else: _os.system(command_certbot) - _os.system( - "mkdir --parents %s && cp --dereference %s %s" - % ( - _os.path.join(args.target_directory, "private"), - _os.path.join(le_dir, args.domain, "privkey.pem"), - _os.path.join(args.target_directory, "private", "%s.pem" % args.domain), + subjects = [ + {"source_name": "privkey", "target_directory": "private"}, + {"source_name": "cert", "target_directory": "certs"}, + {"source_name": "chain", "target_directory": "chains"}, + {"source_name": "fullchain", "target_directory": "fullchains"}, + ] + for subject in subjects: + _os.system( + "mkdir --parents %s && cp --dereference %s %s" + % ( + _os.path.join(args.target_directory, subject["target_directory"]), + _os.path.join(le_dir, args.domain, "%s.pem" % subject["source_name"]), + _os.path.join(args.target_directory, subject["target_directory"], "%s.pem" % args.domain), + ) ) - ) - _os.system( - "mkdir --parents %s && cp --dereference %s %s" - % ( - _os.path.join(args.target_directory, "certs"), - _os.path.join(le_dir, args.domain, "cert.pem"), - _os.path.join(args.target_directory, "certs", "%s.pem" % args.domain), - ) - ) - _os.system( - "mkdir --parents %s && cp --dereference %s %s" - % ( - _os.path.join(args.target_directory, "chains"), - _os.path.join(le_dir, args.domain, "chain.pem"), - _os.path.join(args.target_directory, "chains", "%s.pem" % args.domain), - ) - ) - _os.system( - "mkdir --parents %s && cp --dereference %s %s" - % ( - _os.path.join(args.target_directory, "fullchains"), - _os.path.join(le_dir, args.domain, "fullchain.pem"), - _os.path.join(args.target_directory, "fullchains", "%s.pem" % args.domain), - ) - ) main()