ndev-stack 0.3.13__tar.gz → 0.3.14__tar.gz

{ndev_stack-0.3.13 → ndev_stack-0.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.13
+Version: 0.3.14
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.13 → ndev_stack-0.3.14}/ndev/__init__.py

@@ -1,7 +1,7 @@
 """
 ndev: Fast, cross-platform PHP developer environment for Windows and Linux.
 """
-__version__ = "0.3.13"
+__version__ = "0.3.14"
 
 from . import common as common
 from .common.logger import logger as logger

{ndev_stack-0.3.13 → ndev_stack-0.3.14}/ndev/linux/commands/setup.py

@@ -51,9 +51,9 @@ def setup_cmd():
             console.print("[bold yellow]Refreshing openSUSE repositories (sudo zypper refresh)...[/bold yellow]")
             subprocess.run(["sudo", "zypper", "--non-interactive", "refresh"], check=True)
             
-            # 2. Install MariaDB, Nginx, curl, and Bubblewrap
-            console.print("\n[bold yellow]Installing MariaDB, Nginx, curl, and Bubblewrap (sudo zypper install)...[/bold yellow]")
-            packages = ["mariadb", "mariadb-client", "nginx", "curl", "bubblewrap"]
+            # 2. Install MariaDB, Nginx, curl, Bubblewrap, and SELinux tools
+            console.print("\n[bold yellow]Installing MariaDB, Nginx, curl, Bubblewrap, and system tools (sudo zypper install)...[/bold yellow]")
+            packages = ["mariadb", "mariadb-client", "nginx", "curl", "bubblewrap", "policycoreutils-python-utils"]
             subprocess.run(["sudo", "zypper", "--non-interactive", "install", "-y"] + packages, check=True)
 
             # Optional mkcert package
@@ -65,27 +65,16 @@ def setup_cmd():
             except Exception:
                 pass
 
-            try:
-                subprocess.run(["sudo", "systemctl", "enable", "--now", "mariadb"], check=False, capture_output=True)
-                subprocess.run(["sudo", "systemctl", "enable", "--now", "nginx"], check=False, capture_output=True)
-            except Exception:
-                pass
-
-            try:
-                from ndev.linux.runtime.nginx_helper import ensure_selinux_httpd_permissions
-                ensure_selinux_httpd_permissions()
-            except Exception:
-                pass
-
-            console.print("[bold green]MariaDB, Nginx, and Bubblewrap installed and configured successfully![/bold green]\n")
+            console.print("[bold green]System packages installed successfully![/bold green]\n")
         else:
             # 1. Update Package Lists
             console.print("[bold yellow]Updating package lists (sudo apt-get update)...[/bold yellow]")
             subprocess.run(["sudo", "apt-get", "update"], check=True)
             
             # 2. Install MariaDB and Nginx
-            console.print("\n[bold yellow]Installing MariaDB and Nginx (sudo apt-get install)...[/bold yellow]")
-            subprocess.run(["sudo", "apt-get", "install", "-y", "mariadb-server", "nginx", "curl"], check=True)
+            console.print("\n[bold yellow]Installing MariaDB, Nginx, curl, Bubblewrap, and system tools (sudo apt-get install)...[/bold yellow]")
+            packages = ["mariadb-server", "nginx", "curl", "bubblewrap", "policycoreutils-python-utils"]
+            subprocess.run(["sudo", "apt-get", "install", "-y"] + packages, check=True)
 
             # Optional mkcert package
             try:
@@ -96,9 +85,63 @@ def setup_cmd():
             except Exception:
                 pass
 
-            console.print("[bold green]MariaDB and Nginx installed successfully![/bold green]\n")
-        
-        # 3. Install Composer
+            console.print("[bold green]System packages installed successfully![/bold green]\n")
+
+        # 3. Auto-configure Stack Services, Permissions, SSL, and SELinux
+        console.print("[bold yellow]Auto-configuring stack services, directories, SSL, and SELinux...[/bold yellow]")
+        from ndev.linux.runtime.nginx_helper import (
+            ensure_selinux_httpd_permissions,
+            ensure_nginx_ssl_dir,
+            ensure_nginx_sites_enabled_included,
+            ensure_development_directories,
+            reload_nginx,
+        )
+
+        # Enable & start system services
+        try:
+            subprocess.run(["sudo", "systemctl", "enable", "--now", "mariadb"], check=False, capture_output=True)
+            subprocess.run(["sudo", "systemctl", "enable", "--now", "nginx"], check=False, capture_output=True)
+            console.print("  [bold green]✓[/bold green] Enabled and started MariaDB and Nginx system services.")
+        except Exception:
+            pass
+
+        # SELinux Permissions
+        try:
+            ok = ensure_selinux_httpd_permissions()
+            if ok:
+                console.print("  [bold green]✓[/bold green] Configured SELinux permissions for Nginx (httpd_t set to permissive).")
+        except Exception as e:
+            logger.warning(f"SELinux configuration notice: {e}")
+
+        # Nginx SSL Directory (/etc/nginx/ssl)
+        try:
+            ensure_nginx_ssl_dir()
+            console.print("  [bold green]✓[/bold green] Configured Nginx SSL certificate directory (/etc/nginx/ssl).")
+        except Exception as e:
+            logger.warning(f"SSL directory configuration notice: {e}")
+
+        # Nginx Sites-Enabled / Vhosts Bridge
+        try:
+            ensure_nginx_sites_enabled_included()
+            console.print("  [bold green]✓[/bold green] Configured Nginx sites-available/sites-enabled directory bridge.")
+        except Exception as e:
+            logger.warning(f"Nginx bridge configuration notice: {e}")
+
+        # Web development root permissions and docroot traversal
+        try:
+            ensure_development_directories()
+            console.print("  [bold green]✓[/bold green] Configured web development root permissions (~/Sites).")
+        except Exception as e:
+            logger.warning(f"Docroot permission notice: {e}")
+
+        # Reload Nginx
+        try:
+            reload_nginx()
+            console.print("  [bold green]✓[/bold green] Nginx web server configuration reloaded.")
+        except Exception:
+            pass
+
+        # 4. Install Composer
         local_bin = get_user_local_bin_dir()
         composer_bin = local_bin / "composer"
         if composer_bin.exists():
@@ -150,7 +193,12 @@ def setup_cmd():
             chown_to_sudo_user(ndev_link)
             console.print(f"[bold green]Created symlink {ndev_link} -> {ndev_venv_path}[/bold green]")
             
-        console.print("\n[bold green]System setup completed successfully![/bold green]")
+        console.print("\n[bold green]System setup completed successfully![/bold green]\n")
+        try:
+            from ndev.linux.commands.doctor import doctor_cmd
+            doctor_cmd()
+        except Exception:
+            pass
         
     except subprocess.CalledProcessError as e:
         logger.error(f"Command execution failed: {e}")

{ndev_stack-0.3.13 → ndev_stack-0.3.14}/ndev/linux/runtime/nginx_helper.py

@@ -74,14 +74,26 @@ def run_privileged_command(
     capture_output: bool = True
 ) -> subprocess.CompletedProcess:
     """
-    Run a command with elevated privileges using sudo -n if non-root.
+    Run a command with elevated privileges using sudo if non-root.
     Validates sudo password first if provided to refresh the sudo credential timestamp.
+    If no password provided:
+      - Uses sudo -n if not in an interactive terminal or if sudo timestamp is active.
+      - Falls back to interactive sudo if in an interactive terminal.
     """
     full_cmd = list(cmd)
     if os.geteuid() != 0:
         if password:
             validate_sudo_password(password)
-        full_cmd = ["sudo", "-n"] + full_cmd
+            full_cmd = ["sudo", "-n"] + full_cmd
+        else:
+            if not check_sudo_needs_password():
+                full_cmd = ["sudo", "-n"] + full_cmd
+            elif sys.stdin.isatty():
+                full_cmd = ["sudo"] + full_cmd
+                capture_output = False
+            else:
+                full_cmd = ["sudo", "-n"] + full_cmd
+
     return subprocess.run(
         full_cmd,
         check=check,
@@ -156,6 +168,67 @@ def ensure_selinux_httpd_permissions(password: Optional[str] = None) -> bool:
     return success or is_selinux_httpd_permissive()
 
 
+def ensure_nginx_ssl_dir(password: Optional[str] = None) -> Path:
+    """
+    Ensure /etc/nginx/ssl directory exists with 0755 permissions and proper SELinux context.
+    """
+    ssl_dir = Path("/etc/nginx/ssl")
+    if os.geteuid() == 0:
+        ssl_dir.mkdir(parents=True, exist_ok=True)
+        try:
+            os.chmod(str(ssl_dir), 0o755)
+        except Exception:
+            pass
+    else:
+        run_privileged_command(["mkdir", "-p", str(ssl_dir)], password=password, check=False)
+        run_privileged_command(["chmod", "755", str(ssl_dir)], password=password, check=False)
+
+    if shutil.which("restorecon"):
+        run_privileged_command(["restorecon", "-Rv", str(ssl_dir)], password=password, check=False)
+
+    return ssl_dir
+
+
+def ensure_development_directories(password: Optional[str] = None) -> None:
+    """
+    Ensure the user home directory has +x traversal permissions,
+    ~/Sites directory exists with 0755 permissions, and any configured vhost docroots are accessible.
+    """
+    home = Path.home()
+    sudo_user = os.environ.get("SUDO_USER")
+    if sudo_user:
+        try:
+            import pwd
+            home = Path(pwd.getpwnam(sudo_user).pw_dir)
+        except Exception:
+            pass
+
+    # Ensure home has traversal (+x)
+    try:
+        st = home.stat()
+        if not (st.st_mode & 0o001):
+            os.chmod(str(home), st.st_mode | 0o001)
+    except Exception:
+        pass
+
+    # Ensure ~/Sites exists
+    sites_dir = home / "Sites"
+    try:
+        sites_dir.mkdir(parents=True, exist_ok=True)
+        os.chmod(str(sites_dir), 0o755)
+    except Exception:
+        pass
+
+    # Ensure all configured vhost docroots are accessible
+    try:
+        for vhost in list_vhosts():
+            docroot = vhost.get("root")
+            if docroot and Path(docroot).exists():
+                ensure_docroot_accessible(Path(docroot))
+    except Exception:
+        pass
+
+
 def write_privileged_file(target: Path, content: str, password: Optional[str] = None) -> None:
     """
     Write content to a file, using sudo tee if current process lacks permissions.

{ndev_stack-0.3.13 → ndev_stack-0.3.14}/ndev_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.13
+Version: 0.3.14
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.13 → ndev_stack-0.3.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ndev-stack"
-version = "0.3.13"
+version = "0.3.14"
 description = "Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows"
 readme = "README.md"
 requires-python = ">=3.10"