.gitignore

@@ -1 +0,0 @@
-.vscode

defaults/main.yml

@@ -1,27 +1,10 @@
+acme_directory: https://acme-v02.api.letsencrypt.org/directory
 acme_config_dir: /etc/ssl
-acme_config_file: "{{ acme_config_dir }}/acme.yml"
 acme_keys_dir: "{{ acme_config_dir }}/private"
 acme_csr_dir: "{{ acme_config_dir }}/csr"
 acme_certs_dir: "{{ acme_config_dir }}/certs"
 acme_accounts_dir: "{{ acme_config_dir }}/accounts"
-acme_script_dir: /opt/acme
-acme_script_bin: /usr/local/bin/acme-renew-cert
-
+acme_account_key: "acme_account.key"
 acme_ssl_group: ssl-cert
-acme_config:
-  account:
-    private_key: "{{ acme_accounts_dir }}/acme_account.key"
-    email: acme@example.com
-    owner: root
-    group: root
-  directory_url: https://acme-staging-v02.api.letsencrypt.org/directory
-  challenge_dir: /var/www/acme/.well-known/acme-challenge
-  domains:
-    example.com:
-      alt_names: 
-        - test.example.com
-      owner: root
-      group: "{{ acme_ssl_group }}"
-      remaining_days: 30
-      hooks:
-        - systemctl reload nginx
+acme_challenge_dir: /var/www/acme
+acme_domains: []

files/acme_renew_cert.py

@@ -1,412 +1,241 @@
 #!/usr/bin/env python3
 
-import grp
 import logging
 import os
-import pwd
-import subprocess
 import sys
 from datetime import datetime
-from typing import List, Dict
 
-import acme
 import josepy as jose
-import requests
-import yaml
-from acme import client, messages, challenges, crypto_util
+import acme
 from OpenSSL import crypto
+from acme import client, messages, challenges, crypto_util
 
-SSL_CONFIG_DIR = "/etc/ssl"
-SSL_CONFIG_FILE = os.path.join(SSL_CONFIG_DIR, "acme.yml")
-SSL_ACCOUNTS_DIR = os.path.join(SSL_CONFIG_DIR, "accounts")
-SSL_KEYS_DIR = os.path.join(SSL_CONFIG_DIR, "private")
-SSL_CSR_DIR = os.path.join(SSL_CONFIG_DIR, "csr")
-SSL_CERTS_DIR = os.path.join(SSL_CONFIG_DIR, "certs")
-
-try:
-    SSL_GROUP = grp.getgrnam("ssl-cert").gr_name
-except KeyError:
-    SSL_GROUP = "root"
-
-ACME_ACCOUNT_KEY = os.path.join(SSL_ACCOUNTS_DIR, "acme_account.key")
-ACME_CHALLENGE_DIR = "/var/www/acme/.well-known/acme-challenge"
-LETSENCRYPT_DIRECTORY_URL = "https://acme-v02.api.letsencrypt.org/directory"
+SSL_CONFIG_DIR="/etc/ssl"
 OPENSSL_DATE_FORMAT = '%Y%m%d%H%M%SZ'
-CERT_REMAINING_DAYS = 30
-USER_AGENT = "python-acme"
+USER_AGENT="python-acme"
 
-OS_OWNERS = {}
-OS_GROUPS = {}
+def get_cert_expiration_days(cert_path: str):
+    """Calculate remaining number of days before certificate's expiration.
 
+    :param str cert_path: Path to a certificate file.
 
-def chown(path: str, owner: str, group: str, **kwargs) -> None:
-    if owner not in OS_OWNERS:
-        OS_OWNERS[owner] = pwd.getpwnam(owner).pw_uid
-    if group not in OS_GROUPS:
-        OS_GROUPS[group] = grp.getgrnam(group).gr_gid
-    os.chown(path, OS_OWNERS[owner], OS_GROUPS[group], **kwargs)
+    :returns: Number of remaining days before certificate's expiration.
+    :rtype: int
+    """
+    now = datetime.now()
+    cert_expiration_date = now
 
+    try:
+        with open(cert_path, 'rb') as pem_in:
+            fullchain_pem = crypto.load_certificate(crypto.FILETYPE_PEM, pem_in.read())
+        cert_expiration_date = datetime.strptime(fullchain_pem.get_notAfter().decode(), OPENSSL_DATE_FORMAT)
+    except IOError as e:
+        logging.warning(f"Unable to load certificate: {e}")
 
-class PrivateKey:
-    def __init__(self, private_key: str, owner: str, group: str):
-        self.private_key = private_key
-        self.owner = owner
-        self.group = group
+    cert_expiration_days = (cert_expiration_date - now).days
+    return cert_expiration_days
 
-    def load_or_create_private_key(self) -> crypto.PKey:
-        logging.info(f"Loading private key from {self.private_key}")
-        try:
-            with open(self.private_key, 'rb') as pem_in:
-                private_key_pem = crypto.load_privatekey(crypto.FILETYPE_PEM,
-                                                         pem_in.read())
-            return private_key_pem
-        except IOError as e:
-            logging.warning(f"Unable to load private key: {e}")
+def load_or_create_csr(domain: str, csr_path: str, privkey_path: str):
+    """Load or create a CSR for a given domain.
 
-            logging.info("Generating a new private key")
-            private_key_pem = crypto.PKey()
-            private_key_pem.generate_key(crypto.TYPE_RSA, 4096)
+    :param str domain: A domain name.
+    :param str csr_path: Path to a CSR file.
+    :param str privkey_path: Path to a private key. It is used as fallback when the CSR doesn't exist.
 
-            logging.info(f"Writing private key into {self.private_key}")
-            private_key_dir = os.path.dirname(self.private_key)
-            os.makedirs(private_key_dir, mode=0o750, exist_ok=True)
-            chown(private_key_dir, self.owner, self.group)
-            ofd = os.open(self.private_key, os.O_CREAT | os.O_WRONLY, 0o640)
-            with open(ofd, 'wb') as pem_out:
-                pem_out.write(crypto.dump_privatekey(crypto.FILETYPE_PEM,
-                                                     private_key_pem))
-            chown(self.private_key, self.owner, self.group)
-            return private_key_pem
+    :returns: The CSR in PEM file format.
+    :rtype: str
+    """
+    logging.info(f"Loading {domain} CSR file from {csr_path}…")
+    try:
+      with open(csr_path, 'r') as pem_in:
+        csr_pem = pem_in.read()
+    except IOError as e:
+        logging.warning(f"Unable to load CSR file: {e}")
+        logging.info(f"Loading {domain} private key from {privkey_path}…")
+        with open(privkey_path, 'r') as pem_in:
+            privkey_pem = pem_in.read()
+        
+        logging.info(f"Generating a new CSR…")
+        csr_pem = crypto_util.make_csr(privkey_pem, [domain])
+    return csr_pem
 
+def select_http01_challenge(order: messages.OrderResource):
+    """Select the HTTP-01 challenge from a given order
 
-class Account(PrivateKey):
-    def __init__(self, private_key: str, email: str, owner: str, group: str):
-        super().__init__(private_key, owner, group)
-        self.private_key_pem = self.load_or_create_private_key()
-        self.email = email
+    :param messages.OrderResource order: ACME order containing the challenges.
 
-        self.jwk = jose.JWKRSA(key=self.private_key_pem.to_cryptography_key())
-        self.jwk_pub = self.jwk.public_key()
+    :returns: The HTTP-01 challenge.
+    :rtype: challenges.Challenge
+    """
+    for auth in order.authorizations:
+        for challenge in auth.body.challenges:
+            if isinstance(challenge.chall, challenges.HTTP01):
+                return challenge
+    raise Exception("HTTP-01 challenge was not offered by the CA server.")
 
-    def register(self, directory_url: str) -> acme.client.ClientV2:
-        client_network = client.ClientNetwork(self.jwk, user_agent=USER_AGENT)
+def perform_http01_challenge(
+    client_acme: client.ClientV2,
+    challenge: challenges.Challenge,
+    order: messages.OrderResource,
+    challenge_dir: str):
+    """Perform the HTTP-01 challenge in a given directory
 
-        directory_json = client_network.get(directory_url).json()
-        directory = messages.Directory.from_json(directory_json)
-        acme_client = client.ClientV2(directory, net=client_network)
+    :param client.ClientV2 client_acme: A ACME v2 client
+    :param challenges.Challenge challenge: A ACME challenge
+    :param messages.OrderResource order: An ACME order
+    :param str challenge_dir: The directory containing the challenge
 
-        try:
-            logging.info(f"Registering with a new ACME account")
-            registration = messages.NewRegistration.from_data(
-                email=self.email,
-                terms_of_service_agreed=True)
-            acme_client.new_account(registration)
-        except acme.errors.ConflictError as e:
-            logging.warning(f"Unable to create a new ACME account: {e}")
-            logging.info("Registering with an existing ACME account")
-            registration_message = messages.NewRegistration(
-                key=self.jwk_pub,
-                only_return_existing=True)
-            registration_response = acme_client._post(directory["newAccount"],
-                                                      registration_message)
-            account = acme_client._regr_from_response(registration_response)
-            acme_client.net.account = account
-        return acme_client
+    :returns: The fullchain certificate in PEM file format
+    :rtype: str
+    """
+    response, validation = challenge.response_and_validation(client_acme.net.key)
+    validation_filename, _ = validation.split('.')
 
+    challenge_path = os.path.join(challenge_dir, validation_filename)
+    with open(challenge_path, 'w') as f_out:
+        f_out.write(validation)
 
-class Challenge:
-    def __init__(self, path: str, acme_client: acme.client.ClientV2):
-        self.path = path
-        self.acme_client = acme_client
+    client_acme.answer_challenge(challenge, response)
 
-    def run(self, csr_pem: str) -> str:
-        logging.info("Ordering ACME challenge")
-        order = self.acme_client.new_order(csr_pem)
+    fullchain_pem = client_acme.poll_and_finalize(order).fullchain_pem
 
-        logging.info("Selecting HTTP-01 ACME challenge")
-        challenge = self.select_http01_challenge(order)
+    os.remove(challenge_path)
 
-        logging.info("Performing HTTP-01 ACME challenge")
-        fullchain_pem = self.perform_http01_challenge(challenge, order)
-        return fullchain_pem
+    return fullchain_pem
 
-    @staticmethod
-    def select_http01_challenge(order: messages.OrderResource) \
-            -> challenges.Challenge:
-        """Select the HTTP-01 challenge from a given order
+def renew_cert(domain: str,
+        account_key_path: str,
+        privkey_path: str,
+        csr_path: str,
+        certs_dir: str,
+        challenge_dir: str,
+        directory_url: str,
+        days_before_renewal: int,
+        force: bool = False):
+    logging.info(f"Checking {domain} certificate's expiration date…")
+    fullchain_path = os.path.join(certs_dir, "fullchain.pem")
 
-        :param messages.OrderResource order: Order containing the challenges.
+    cert_expiration_days = get_cert_expiration_days(fullchain_path)
+    if not force and (cert_expiration_days >= days_before_renewal):
+        logging.info(f"Certificate expires in {cert_expiration_days} days. Nothing to do.")
+        return
 
-        :returns: The HTTP-01 challenge.
-        :rtype: challenges.Challenge
-        """
-        for auth in order.authorizations:
-            for challenge in auth.body.challenges:
-                if isinstance(challenge.chall, challenges.HTTP01):
-                    return challenge
-        raise Exception("HTTP-01 challenge was not offered by the CA server.")
+    logging.info(f"Certificate expires in {cert_expiration_days} days! Renewing certificate…")
 
-    def perform_http01_challenge(self, challenge: challenges.Challenge,
-                                 order: messages.OrderResource) -> str:
-        """Perform the HTTP-01 challenge in a given directory
+    logging.info(f"Loading account key from {account_key_path}…")
+    with open(account_key_path, 'rb') as pem_in:
+        account_pem = crypto.load_privatekey(crypto.FILETYPE_PEM, pem_in.read())
+    account_jwk = jose.JWKRSA(key=account_pem.to_cryptography_key())
+    account_jwk_pub = account_jwk.public_key()
 
-        :param challenges.Challenge challenge: A ACME challenge
-        :param messages.OrderResource order: An ACME order
+    csr_pem = load_or_create_csr(domain, csr_path, privkey_path)
 
-        :returns: The fullchain certificate in PEM file format
-        :rtype: str
-        """
-        account_key = self.acme_client.net.key
-        response, validation = challenge.response_and_validation(account_key)
-        validation_filename, _ = validation.split('.')
+    client_network = client.ClientNetwork(account_jwk, user_agent=USER_AGENT)
+    directory = messages.Directory.from_json(client_network.get(directory_url).json())
+    client_acme = client.ClientV2(directory, net=client_network)
 
-        challenge_path = os.path.join(self.path, validation_filename)
-        logging.info(f"Writing challenge into {challenge_path} directory")
-        os.makedirs(self.path, mode=0o755, exist_ok=True)
-        with open(challenge_path, 'w') as ofd:
-            ofd.write(validation)
+    logging.info("Registering with ACME account…")
+    # Here we assume we already have an account
+    registration_message = messages.NewRegistration(
+        key=account_jwk_pub,
+        only_return_existing=True)
+    registration_response = client_acme._post(directory["newAccount"], registration_message)
+    account = client_acme._regr_from_response(registration_response)
+    client_acme.net.account = account
 
-        self.acme_client.answer_challenge(challenge, response)
+    logging.info("Ordering ACME challenge…")
+    order = client_acme.new_order(csr_pem)
 
-        fullchain_pem = self.acme_client.poll_and_finalize(order).fullchain_pem
-        os.remove(challenge_path)
-        return fullchain_pem
+    logging.info("Selecting HTTP-01 ACME challenge…")
+    challenge = select_http01_challenge(order)
 
+    logging.info("Performing HTTP-01 ACME challenge…")
+    fullchain_pem = perform_http01_challenge(client_acme, challenge, order, challenge_dir)
 
-class Domain(PrivateKey):
-    def __init__(self, name: str, owner: str, group: str,
-                 alt_names: List[str] = None,
-                 remaining_days: int = CERT_REMAINING_DAYS,
-                 hooks: List[str] = None):
-        private_key = os.path.join(SSL_KEYS_DIR, name + '.key')
-        super().__init__(private_key, owner, group)
+    logging.info(f"Writing {domain} certificates into {certs_dir}…")
+    certs_pem = []
+    for line in fullchain_pem.split('\n'):
+        if 'BEGIN CERTIFICATE' in line:
+            cert_pem = ''
+        
+        cert_pem += line + '\n'
 
-        self.name = name
-        self.alt_names = [] if alt_names is None else alt_names
-        self.remaining_days = remaining_days
-        self.hooks = [] if hooks is None else hooks
+        if 'END CERTIFICATE' in line:
+            certs_pem.append(cert_pem)
+    
+    cert_path = os.path.join(certs_dir, "cert.pem")
+    with open(cert_path, 'w') as pem_out:
+        pem_out.write(certs_pem[0])
+    
+    chain_path = os.path.join(certs_dir, "chain.pem")
+    with open(chain_path, 'w') as pem_out:
+        pem_out.write(''.join(certs_pem[1:]))
 
-        certs_dir = os.path.join(SSL_CERTS_DIR, name + '.d')
-        self.csr = os.path.join(SSL_CSR_DIR, name + '.csr')
-        self.cert = os.path.join(certs_dir, 'cert.pem')
-        self.chain_cert = os.path.join(certs_dir, 'chain.pem')
-        self.fullchain_cert = os.path.join(certs_dir, 'fullchain.pem')
-        self.cert_expiration_days = None
+    with open(fullchain_path, 'w') as pem_out:
+        pem_out.write(fullchain_pem)
 
-    def check_certificate_expiration_date(self) -> bool:
-        """Indicate whether the certificate will expire soon or not.
+if __name__ == '__main__':
+    import argparse
 
-        :returns: True if the certificate expires soon.
-        :rtype: bool
-        """
-        if self.cert_expiration_days is None:
-            logging.debug(f"Checking '{self.cert}' certificate expiration "
-                          "date")
-            try:
-                with open(self.cert, 'rb') as pem_in:
-                    cert_pem = crypto.load_certificate(crypto.FILETYPE_PEM,
-                                                       pem_in.read())
-            except IOError as e:
-                logging.warning(f"Unable to load certificate: {e}")
-                self.cert_expiration_days = float("-inf")
-                return True
-
-            now = datetime.now()
-            cert_raw_expiration_date = cert_pem.get_notAfter().decode()
-            cert_expiration_date = datetime.strptime(cert_raw_expiration_date,
-                                                     OPENSSL_DATE_FORMAT)
-            self.cert_expiration_days = (cert_expiration_date - now).days
-            logging.info(f"Certificate expires in {self.cert_expiration_days} "
-                         "days.")
-        return self.cert_expiration_days <= self.remaining_days
-
-    def renew_cert(self, challenge: Challenge, force: bool = False) -> None:
-        if not (force or self.check_certificate_expiration_date()):
-            return
-        logging.info(f"Renewing {self.name} certificates")
-
-        csr_pem = self.load_or_create_csr()
-        fullchain_pem = challenge.run(csr_pem)
-
-        logging.info(f"Saving {self.name} certificates")
-        certs_pem = []
-        for line in fullchain_pem.split('\n'):
-            if 'BEGIN CERTIFICATE' in line:
-                cert_pem = ''
-
-            cert_pem += line + '\n'
-
-            if 'END CERTIFICATE' in line:
-                certs_pem.append(cert_pem)
-
-        logging.info(f"Writing '{self.cert}' certificate")
-        cert_dir = os.path.dirname(self.cert)
-        os.makedirs(cert_dir, mode=0o755, exist_ok=True)
-        with open(self.cert, 'w') as pem_out:
-            pem_out.write(certs_pem[0])
-
-        logging.info(f"Writing '{self.chain_cert}' chain certificate")
-        chain_cert_dir = os.path.dirname(self.chain_cert)
-        os.makedirs(chain_cert_dir, mode=0o755, exist_ok=True)
-        with open(self.chain_cert, 'w') as pem_out:
-            pem_out.write(''.join(certs_pem[1:]))
-
-        logging.info(f"Writing '{self.fullchain_cert}' full chain certificate")
-        fullchain_cert_dir = os.path.dirname(self.fullchain_cert)
-        os.makedirs(fullchain_cert_dir, mode=0o755, exist_ok=True)
-        with open(self.fullchain_cert, 'w') as pem_out:
-            pem_out.write(fullchain_pem)
-
-        self.run_hooks()
-
-    def load_or_create_csr(self) -> str:
-        """Load or create a CSR for the domain.
-
-        :returns: The CSR in PEM file format.
-        :rtype: str
-        """
-        logging.info(f"Loading {self.name} CSR file from '{self.csr}'")
-        try:
-            with open(self.csr, 'rb') as pem_in:
-                csr = pem_in.read()
-            csr_pem = crypto.load_certificate_request(crypto.FILETYPE_PEM, csr)
-        except IOError as e:
-            logging.warning(f"Unable to load CSR file: {e}")
-            csr = self.create_csr()
-
-        logging.info("Checking if CSR contains all the domains")
-        domain_names = set()
-        for ext in csr_pem.get_extensions():
-            if ext.get_short_name().decode() != "subjectAltName":
-                continue
-            subject_domains = str(ext).split(',')
-            for subject_domain in subject_domains:
-                _, domain = str(subject_domain).split(':')
-                domain_names.add(domain)
-        domain_names_diff = domain_names ^ set([self.name] + self.alt_names)
-        if len(domain_names_diff) > 0:
-            logging.warning(f"Differences found in CSR: {domain_names_diff}")
-            csr = self.create_csr()
-
-        return csr
-
-    def create_csr(self):
-        private_key_pem = self.load_or_create_private_key()
-        private_key = crypto.dump_privatekey(crypto.FILETYPE_PEM,
-                                             private_key_pem)
-
-        logging.info(f"Generating a new CSR")
-        csr = crypto_util.make_csr(private_key, [self.name] + self.alt_names)
-
-        logging.info(f"Writing CSR file into '{self.csr}'")
-        csr_dir = os.path.dirname(self.csr)
-        os.makedirs(csr_dir, mode=0o755, exist_ok=True)
-        with open(self.csr, 'wb') as pem_out:
-            pem_out.write(csr)
-        return csr
-
-    def run_hooks(self) -> None:
-        for hook in self.hooks:
-            logging.info(f"Running hook: '{hook}'")
-            hook_res = subprocess.run(hook.split(),
-                                      stdout=subprocess.DEVNULL,
-                                      stderr=subprocess.PIPE)
-            if hook_res.returncode != 0:
-                logging.error(f"Unable to run hook: {hook_res.stderr}")
-
-
-def main():
     parser = argparse.ArgumentParser(
-        description="Renew ACME certificates for a list of domains. This "
-                    "script assumes you already have an account on the CA "
-                    "server and a private key for each certificate.",
+        description="Renew ACME certificates for a list of domains. This script assumes you already have an account on the CA server and a private key for each certificate.",
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-    parser.add_argument("--config", "-c", default=SSL_CONFIG_FILE,
-                        help="Path to the config file.")
-    parser.add_argument("--quiet", "-q", action="store_true",
-                        help="Quiet mode.")
-    parser.add_argument("--verbose", "-v", action="store_true",
-                        help="Increase verbosity.")
-    parser.add_argument("--force", "-f", action="store_true",
-                        help="Force certificates renewal without checking "
-                             "their expiration date.")
+    parser.add_argument("domains", nargs='+',
+        help="List of domain names for which to renew the certificate.")
+    parser.add_argument("--account_key", "-a",
+        default=os.path.join(SSL_CONFIG_DIR, "accounts", "acme_account.key"),
+        help="Path to the account key.")
+    parser.add_argument("--privkey", "-p",
+        default=os.path.join(SSL_CONFIG_DIR, "private", "{domain}.pem"),
+        help="Path to the private certificate.")
+    parser.add_argument("--csr", "-r",
+        default=os.path.join(SSL_CONFIG_DIR, "csr", "{domain}.pem"),
+        help="Path to the CSR file. If the file doesn't exist, it will be generated from the private key and the domain name.")
+    parser.add_argument("--certs", "-o",
+        default=os.path.join(SSL_CONFIG_DIR, "certs", "{domain}.d"),
+        help="Path to the certificates directory.")
+    parser.add_argument("--challenge", "-c",
+        default="/var/www/html/.well-known/acme-challenge",
+        help="Path to the challenge directory.")
+    parser.add_argument("--directory_url", "-u",
+        default="https://acme-v02.api.letsencrypt.org/directory",
+        help="Directory URL on which performing ACME challenges. Only ACME v2 is supported.")
+    parser.add_argument("--days", "-d", type=int,
+        default=30,
+        help="Days before attempting to renew the certificates.")
+    parser.add_argument("--quiet", "-q",
+        action="store_true",
+        help="Quiet mode.")
+    parser.add_argument("--verbose", "-v",
+        action="store_true",
+        help="Increase verbosity.")
+    parser.add_argument("--force", "-f",
+        action="store_true",
+        help="Force certificates renewal without checking their expiration date.")
     args = parser.parse_args()
-
+    
     if args.quiet:
         log_level = logging.WARNING
     elif args.verbose:
         log_level = logging.DEBUG
     else:
         log_level = logging.INFO
+        
+    logging.basicConfig(stream=sys.stdout, level=log_level, format="%(levelname)s:%(message)s")
 
-    logging.basicConfig(stream=sys.stdout, level=log_level,
-                        format="%(levelname)s:%(message)s")
+    for domain in args.domains:
+        account_key = args.account_key.format(domain=domain)
+        privkey = args.privkey.format(domain=domain)
+        csr = args.csr.format(domain=domain)
+        certs_dir = args.certs.format(domain=domain)
+        challenge_dir = args.challenge.format(domain=domain)
 
-    try:
-        with open(args.config, 'r') as ifd:
-            config = yaml.safe_load(ifd)
-    except IOError as e:
-        logging.error(f"Unable to load config file: {e}")
-        return 1
-
-    if isinstance(config["domains"], list):
-        domains = {domain["name"]: domain for domain in config["domains"]}
-        if len(domains) != len(config["domains"]):
-            domain_uniques = set()
-            domain_duplicates = set()
-            for domain in config["domains"]:
-                domain_name = domain["name"]
-                if domain_name not in domain_uniques:
-                    domain_uniques.add(domain_name)
-                else:
-                    domain_duplicates.add(domain_name)
-            logging.error(f"Duplicate domain name(s) found: {domain_uniques}")
-            return 2
-        config["domains"] = domains
-
-    try:
-        domains_to_renew = []
-        for domain_name, domain_details in config["domains"].items():
-            remaining_days = domain_details.get("remaining_days",
-                                                CERT_REMAINING_DAYS)
-            domain = Domain(domain_name,
-                            owner=domain_details.get("owner", "root"),
-                            group=domain_details.get("group", SSL_GROUP),
-                            alt_names=domain_details.get("alt_names"),
-                            remaining_days=remaining_days,
-                            hooks=domain_details.get("hooks"))
-
-            if not (args.force or domain.check_certificate_expiration_date()):
-                logging.info(f"{domain.name} certificate will not be renewed.")
-                continue
-
-            logging.info(f"{domain.name} certificate will be renewed.")
-            domains_to_renew.append(domain)
-
-        if len(domains_to_renew) == 0:
-            logging.info("No domain to renew. Aborting.")
-            return 0
-
-        account_config = config["account"]
-        account = Account(
-            private_key=account_config.get("private_key", ACME_ACCOUNT_KEY),
-            email=account_config["email"],
-            owner=account_config.get("owner", "root"),
-            group=account_config.get("group", "root"))
-
-        directory_url = config.get("directory_url", LETSENCRYPT_DIRECTORY_URL)
-        acme_client = account.register(directory_url)
-
-        challenge_dir = config.get("challenge_dir", ACME_CHALLENGE_DIR)
-        challenge = Challenge(challenge_dir, acme_client)
-
-        for domain in domains_to_renew:
-            domain.renew_cert(challenge, force=args.force)
-    except Exception as e:
-        logging.exception(e)
-        return 3
-
-
-if __name__ == '__main__':
-    import argparse
-    exit(main())
+        renew_cert(domain, 
+            account_key_path=account_key,
+            privkey_path=privkey,
+            csr_path=csr,
+            certs_dir=certs_dir,
+            challenge_dir=challenge_dir,
+            directory_url=args.directory_url,
+            days_before_renewal=args.days,
+            force=args.force)

molecule/default/prepare.yml

@@ -3,13 +3,8 @@
   gather_facts: no
 
   tasks:
-    - name: Update APT cache
+    - name: Update apt cache
       raw: apt update
 
-    - name: Install Python3 package
-      raw: apt install -y --no-install-recommends python3
-
-    - name: Install cron package
-      package:
-        name: cron
-        state: present
+    - name: Install python3 package
+      raw: apt install -y --no-install-recommends python3

tasks/acme_challenge.yml

@@ -0,0 +1,74 @@
+- name: Create {{ domain_name }} certificates directory
+  file:
+    path: "{{ acme_certs_dir }}/{{ domain_name }}.d"
+    state: directory
+    owner: root
+    group: "{{ acme_ssl_group }}"
+    mode: "755"
+  tags: acme_install
+
+- name: Generate Let's Encrypt account key
+  openssl_privatekey:
+    path: "{{ acme_accounts_dir }}/{{ acme_account_key }}"
+    owner: root
+    group: root
+    mode: "600"
+    type: RSA
+    size: 4096
+  tags: acme_account
+
+- name: Generate Let's Encrypt private key for {{ domain_name }}
+  openssl_privatekey:
+    path: "{{ acme_keys_dir }}/{{ domain_name }}.pem"
+    owner: root
+    group: "{{ acme_ssl_group }}"
+    mode: "640"
+    type: RSA
+    size: 4096
+
+- name: Generate Let's Encrypt CSR for {{ domain_name }}
+  openssl_csr:
+    path: "{{ acme_csr_dir }}/{{ domain_name }}.csr"
+    owner: root
+    group: "{{ acme_ssl_group }}"
+    mode: "644"
+    privatekey_path: "{{ acme_keys_dir }}/{{ domain_name }}.pem"
+    common_name: "{{ domain_name }}"
+
+- name: Begin Let's Encrypt challenges for {{ domain_name }}
+  acme_certificate:
+    acme_directory: "{{ acme_directory }}"
+    acme_version: "{{ acme_version }}"
+    account_key_src: "{{ acme_accounts_dir }}/{{ acme_account_key }}"
+    account_email: "{{ acme_email }}"
+    terms_agreed: yes
+    challenge: http-01
+    csr: "{{ acme_csr_dir }}/{{ domain_name }}.csr"
+    dest: "{{ acme_certs_dir }}/{{ domain_name }}.d/cert.pem"
+    fullchain_dest: "{{ acme_certs_dir }}/{{ domain_name }}.d/fullchain.pem"
+    remaining_days: 30
+  register: _acme_challenge
+
+- name: Implement and complete Let's Encrypt challenge for {{ domain_name }}
+  when: _acme_challenge is changed
+  block:
+  - name: Implement http-01 challenge files for {{ domain_name }}
+    copy:
+      content: "{{ _acme_challenge.challenge_data[domain_name]['http-01'].resource_value }}"
+      dest: "{{ acme_challenge_dir }}/{{ _acme_challenge.challenge_data[domain_name]['http-01'].resource }}"
+      owner: root
+      group: root
+      mode: "644"
+  
+  - name: Complete Let's Encrypt challenges for {{ domain_name }}
+    acme_certificate:
+      acme_directory: "{{ acme_directory }}"
+      acme_version: "{{ acme_version }}"
+      account_key_src: "{{ acme_accounts_dir }}/{{ acme_account_key }}"
+      account_email: "{{ acme_email }}"
+      challenge: http-01
+      csr: "{{ acme_csr_dir }}/{{ domain_name }}.csr"
+      dest: "{{ acme_certs_dir }}/{{ domain_name }}.d/cert.pem"
+      chain_dest: "{{ acme_certs_dir }}/{{ domain_name }}.d/chain.pem"
+      fullchain_dest: "{{ acme_certs_dir }}/{{ domain_name }}.d/fullchain.pem"
+      data: "{{ _acme_challenge }}"

tasks/main.yml

@@ -1,59 +1,48 @@
 - name: Install ACME dependencies
   package:
-    name: "{{ package }}"
+    name: python3-acme
     state: present
-  loop: "{{ acme_packages }}"
-  loop_control:
-    loop_var: package
   tags: acme_install
 
 - name: Install SSL dependencies
   package:
     name: ssl-cert
     state: present
-  tags: acme_install
 
-- name: Create ACME config directories
+- name: Create Let's Encrypt config directories
   file:
     path: "{{ config_dir }}"
     state: directory
     owner: root
-    group: root
-    mode: "755"
+    group: "{{ acme_ssl_group }}"
+    mode: "711"
   loop:
-    - "{{ acme_config_dir }}"
-    - "{{ acme_certs_dir }}"
-    - "{{ acme_csr_dir }}"
+  - "{{ acme_config_dir }}"
+  - "{{ acme_keys_dir }}"
+  - "{{ acme_accounts_dir }}"
+  - "{{ acme_csr_dir }}"
   loop_control:
     loop_var: config_dir
   tags: acme_install
 
-- name: Create ACME private keys directory
+- name: Create challenge directory
   file:
-    path: "{{ acme_keys_dir }}"
-    state: directory
-    owner: root
-    group: "{{ acme_ssl_group }}"
-    mode: "750"
-  tags: acme_install
-
-- name: Create ACME accounts directory
-  file:
-    path: "{{ acme_accounts_dir }}"
+    path: "{{ acme_challenge_dir }}/.well-known/acme-challenge"
     state: directory
     owner: root
     group: root
-    mode: "750"
+    mode: "755"
   tags: acme_install
 
-- name: Copy ACME config file
-  copy:
-    content: "{{ acme_config | to_nice_yaml(indent=2) }}"
-    dest: "{{ acme_config_file }}"
-    owner: root
-    group: root
-    mode: "600"
-  tags: [acme_install, acme_config]
+- name: Perform ACME challenge for each domain
+  include_tasks:
+    file: acme_challenge.yml
+    apply:
+      tags: acme_challenge
+  loop: "{{ acme_domains | unique }}"
+  loop_control:
+    loop_var: domain_name
+  tags: acme_challenge
 
 - name: Create directory for certificate renewal tool
   file:
@@ -62,40 +51,31 @@
     group: root
     mode: "755"
     state: directory
-  tags: acme_install
+  tags: acme_renew
 
 - name: Copy script to renew ACME certificates
   copy:
     src: acme_renew_cert.py
-    dest: "{{ acme_script_dir }}/acme_renew_cert.py"
+    dest: /opt/acme/acme_renew_cert.py
     owner: root
     group: root
     mode: "755"
-  tags: acme_install
-
-- name: Create '{{ acme_script_bin }}' symlink for ACME renewal script
-  file:
-    src: "{{ acme_script_dir }}/acme_renew_cert.py"
-    dest: "{{ acme_script_bin }}"
-    state: link
-    owner: root
-    group: root
-    mode: "755"
-  tags: acme_install
-
-- name: Perform ACME challenge for each domain
-  command: acme-renew-cert -c {{ acme_config_file | quote }}
-  changed_when: "'No domain to renew' not in _acme_challenge.stdout"
-  register: _acme_challenge
-  tags: acme_challenge
-
+  tags: acme_renew
+  
 - name: Setup cron job for ACME certificates renewal of {{ domain_name }}
   cron:
-    user: root
-    name: acme-renew-cert
-    cron_file: acme-renew-cert
-    job: "{{ acme_script_bin }} -q -c {{ acme_config_file | quote }}"
+    name: acme renew {{ domain_name }} cert
+    job: >-
+      bash -c 'sleep $((RANDOM \% 3600))' && /opt/acme/acme_renew_cert.py {{ domain_name }} -q
+      -a {{ (acme_accounts_dir + '/' + acme_account_key) | quote }}
+      -p {{ acme_keys_dir | quote }}/{domain}.pem
+      -r {{ acme_csr_dir | quote }}/{domain}.csr
+      -o {{ acme_certs_dir | quote }}/{domain}.d
+      -c {{ acme_challenge_dir | quote }}/.well-known/acme-challenge
     minute: "30"
     hour: "2"
     state: present
-  tags: acme_cron
+  loop: "{{ acme_domains | unique }}"
+  loop_control:
+    loop_var: domain_name
+  tags: acme_renew

vars/main.yml

@@ -1,4 +1 @@
-acme_version: 2
-acme_packages:
-  - python3-acme
-  - python3-yaml
+acme_version: 2