wasm-cli 0.15.7__tar.gz → 0.15.8__tar.gz

{wasm_cli-0.15.7/src/wasm_cli.egg-info → wasm_cli-0.15.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 0.15.7
+Version: 0.15.8
 Summary: Web App System Management - Deploy and manage web applications on Linux servers
 Author: Yago López Prado
 Author-email: Yago López Prado <yago.lopez.adeje@gmail.com>

{wasm_cli-0.15.7 → wasm_cli-0.15.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wasm-cli"
-version = "0.15.7"
+version = "0.15.8"
 description = "Web App System Management - Deploy and manage web applications on Linux servers"
 readme = "README.md"
 license = { text = "WASM-NCSAL" }

{wasm_cli-0.15.7 → wasm_cli-0.15.8}/setup.py

@@ -9,7 +9,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wasm-cli",
-    version="0.15.7",
+    version="0.15.8",
     description="Web App System Management - Deploy and manage web applications on Linux servers",
     author="Yago López Prado",
     author_email="yago.lopez.adeje@gmail.com",

{wasm_cli-0.15.7 → wasm_cli-0.15.8}/src/wasm/__init__.py

@@ -8,7 +8,7 @@ WASM - Web App System Management
 A robust CLI tool for deploying and managing web applications on Linux servers.
 """
 
-__version__ = "0.15.7"
+__version__ = "0.15.8"
 __author__ = "Yago López Prado"
 __license__ = "WASM-NCSAL"
 

{wasm_cli-0.15.7 → wasm_cli-0.15.8}/src/wasm/cli/commands/site.py

@@ -102,29 +102,30 @@ def _handle_create(args: Namespace) -> int:
     if not no_ssl:
         cert_manager = CertManager(verbose=args.verbose)
         if cert_manager.is_installed():
-            # Check if a valid certificate already exists
+            additional_domains = None
+            if include_www:
+                additional_domains = [f"www.{domain}"]
+
+            # Check if a valid certificate already exists and covers all domains
             if cert_manager.cert_exists(domain):
                 test = cert_manager.test_cert(domain)
                 if test.get("valid"):
-                    logger.info(f"Valid SSL certificate found for {domain}")
-                    ssl_obtained = True
+                    all_required = [domain] + (additional_domains or [])
+                    if cert_manager.cert_covers_domains(domain, all_required):
+                        logger.info(f"Valid SSL certificate found covering all domains")
+                        ssl_obtained = True
+                    else:
+                        logger.info("Existing certificate does not cover all domains, expanding...")
                 else:
-                    logger.warning(f"Existing certificate invalid, obtaining new one...")
+                    logger.warning("Existing certificate invalid, obtaining new one...")
 
             if not ssl_obtained:
                 logger.info(f"Obtaining SSL certificate for {domain}...")
                 try:
-                    additional_domains = None
-                    if include_www:
-                        additional_domains = [f"www.{domain}"]
-
-                    nginx = args.webserver == "nginx"
-                    apache = args.webserver == "apache"
-
                     cert_manager.obtain(
                         domain,
-                        nginx=nginx,
-                        apache=apache,
+                        nginx=args.webserver == "nginx",
+                        apache=args.webserver == "apache",
                         additional_domains=additional_domains,
                     )
                     ssl_obtained = True

{wasm_cli-0.15.7 → wasm_cli-0.15.8}/src/wasm/managers/cert_manager.py

@@ -130,6 +130,27 @@ class CertManager(BaseManager):
         
         return None
     
+    def cert_covers_domains(self, domain: str, required_domains: List[str]) -> bool:
+        """
+        Check if an existing certificate covers all required domains.
+
+        Args:
+            domain: Primary domain (certificate name).
+            required_domains: List of domains that must be covered.
+
+        Returns:
+            True if all required domains are covered.
+        """
+        info = self.get_cert_info(domain)
+        if not info:
+            return False
+
+        cert_domains = info.get("domains", [])
+        for d in required_domains:
+            if d not in cert_domains:
+                return False
+        return True
+
     def _check_certbot_plugin(self, plugin: str) -> bool:
         """
         Check if a certbot plugin is available.
@@ -178,10 +199,18 @@ class CertManager(BaseManager):
             CertificateError: If certificate issuance fails.
         """
         if self.cert_exists(domain) and not dry_run:
-            if not expand or not additional_domains:
+            # If additional domains requested, check if cert already covers them
+            if additional_domains:
+                all_required = [domain] + additional_domains
+                if self.cert_covers_domains(domain, all_required):
+                    self.logger.info(f"Certificate already covers all domains: {', '.join(all_required)}")
+                    return True
+                # Cert exists but doesn't cover all domains - need to expand
+                self.logger.info(f"Expanding certificate to include: {', '.join(additional_domains)}")
+                expand = True
+            elif not expand:
                 self.logger.warning(f"Certificate already exists for {domain}")
                 return True
-            self.logger.info(f"Expanding certificate for {domain}")
         
         # Build command
         cmd = ["certbot", "certonly"]

{wasm_cli-0.15.7 → wasm_cli-0.15.8/src/wasm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 0.15.7
+Version: 0.15.8
 Summary: Web App System Management - Deploy and manage web applications on Linux servers
 Author: Yago López Prado
 Author-email: Yago López Prado <yago.lopez.adeje@gmail.com>