wasm-cli 0.15.4__tar.gz → 0.15.6__tar.gz

{wasm_cli-0.15.4/src/wasm_cli.egg-info → wasm_cli-0.15.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 0.15.4
+Version: 0.15.6
 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.4 → wasm_cli-0.15.6}/pyproject.toml

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

{wasm_cli-0.15.4 → wasm_cli-0.15.6}/setup.py

@@ -9,7 +9,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wasm-cli",
-    version="0.15.4",
+    version="0.15.6",
     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.4 → wasm_cli-0.15.6}/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.4"
+__version__ = "0.15.6"
 __author__ = "Yago López Prado"
 __license__ = "WASM-NCSAL"
 

{wasm_cli-0.15.4 → wasm_cli-0.15.6}/src/wasm/cli/commands/site.py

@@ -67,21 +67,83 @@ def _get_manager(webserver: str, verbose: bool = False):
 def _handle_create(args: Namespace) -> int:
     """Handle site create command."""
     logger = Logger(verbose=args.verbose)
-    
+
+    from wasm.validators.domain import should_include_www
+    from wasm.managers.cert_manager import CertManager
+
     domain = validate_domain(args.domain)
     manager = _get_manager(args.webserver, verbose=args.verbose)
-    
+    no_ssl = getattr(args, "no_ssl", False)
+    include_www = getattr(args, "www", False) and should_include_www(domain)
+
+    server_names = domain
+    if include_www:
+        server_names = f"{domain} www.{domain}"
+        logger.info(f"Including www.{domain}")
+
+    # Step 1: Create site without SSL (needed for certbot webroot validation)
     context = {
         "port": args.port,
-        "ssl": False,  # SSL will be handled separately
+        "ssl": False,
+        "server_names": server_names,
     }
-    
+
     logger.info(f"Creating site: {domain}")
     manager.create_site(domain, template=args.template, context=context)
     manager.enable_site(domain)
     manager.reload()
-    
-    logger.success(f"Site created and enabled: {domain}")
+
+    # Step 2: Obtain SSL certificate if requested
+    ssl_obtained = False
+    if not no_ssl:
+        cert_manager = CertManager(verbose=args.verbose)
+        if cert_manager.is_installed():
+            # Check if a valid certificate already exists
+            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
+                else:
+                    logger.warning(f"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,
+                        additional_domains=additional_domains,
+                    )
+                    ssl_obtained = True
+                except WASMError as e:
+                    logger.warning(f"SSL certificate failed: {e}")
+                    logger.info("Site created without SSL. You can add it later with: wasm cert create")
+        else:
+            logger.warning("Certbot not installed, skipping SSL")
+            logger.info("Install with: sudo apt install certbot")
+
+    # Step 3: Recreate site config with SSL if certificate was obtained
+    if ssl_obtained:
+        cert_paths = cert_manager.get_cert_path(domain)
+        context["ssl"] = True
+        context["ssl_certificate"] = str(cert_paths["fullchain"])
+        context["ssl_certificate_key"] = str(cert_paths["privkey"])
+
+        manager.create_site(domain, template=args.template, context=context)
+        manager.reload()
+        logger.success(f"Site created with SSL: {domain}")
+    else:
+        logger.success(f"Site created: {domain}")
+
     return 0
 
 

{wasm_cli-0.15.4 → wasm_cli-0.15.6}/src/wasm/cli/interactive.py

@@ -365,12 +365,31 @@ class InteractiveMode:
                 default="3000",
                 validate=lambda _, x: check_port(x) or "Invalid port",
             ),
+            inquirer.Confirm(
+                "ssl",
+                message="Configure SSL certificate?",
+                default=True,
+            ),
         ]
-        
+
         answers = inquirer.prompt(questions, theme=GreenPassion())
         if not answers:
             return 0
-        
+
+        # Ask about www if SSL enabled and domain is a base domain
+        from wasm.validators.domain import should_include_www
+        include_www = False
+        if answers["ssl"] and should_include_www(answers["domain"]):
+            www_questions = [
+                inquirer.Confirm(
+                    "include_www",
+                    message=f"Include www.{answers['domain']} in certificate and web server config?",
+                    default=True,
+                ),
+            ]
+            www_answers = inquirer.prompt(www_questions, theme=GreenPassion())
+            include_www = www_answers.get("include_www", True) if www_answers else False
+
         from argparse import Namespace
         args = Namespace(
             verbose=self.verbose,
@@ -379,8 +398,10 @@ class InteractiveMode:
             webserver=answers["webserver"],
             template=answers["template"],
             port=int(answers["port"]),
+            no_ssl=not answers["ssl"],
+            www=include_www,
         )
-        
+
         from wasm.cli.commands.site import handle_site
         return handle_site(args)
     

{wasm_cli-0.15.4 → wasm_cli-0.15.6}/src/wasm/cli/parser.py

@@ -410,7 +410,17 @@ def _add_site_parser(subparsers) -> None:
         default=3000,
         help="Backend port for proxy",
     )
-    
+    create.add_argument(
+        "--no-ssl",
+        action="store_true",
+        help="Skip SSL certificate configuration",
+    )
+    create.add_argument(
+        "--www",
+        action="store_true",
+        help="Include www subdomain in SSL certificate and web server config",
+    )
+
     # site list
     list_cmd = site_sub.add_parser(
         "list",

{wasm_cli-0.15.4 → wasm_cli-0.15.6/src/wasm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 0.15.4
+Version: 0.15.6
 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>