machineconfig 3.99__tar.gz → 4.0__tar.gz

{machineconfig-3.99/src/machineconfig.egg-info → machineconfig-4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.99
+Version: 4.0
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-3.99 → machineconfig-4.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "3.99"
+version = "4.0"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -68,9 +68,6 @@ repos = "machineconfig.scripts.python.repos:main_from_parser"
 start_slidev = "machineconfig.scripts.python.start_slidev:arg_parser"
 wifi_conn = "machineconfig.scripts.python.wifi_conn:arg_parser"
 kill_process = "machineconfig.utils.procs:main"
-# ia = "machineconfig.scripts.python.interactive:main"  # Used 
-# install = "machineconfig.scripts.python.devops_devapps_install:main_with_parser"
-# share_terminal = "machineconfig.scripts.python.share_terminal:main_with_parser"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

machineconfig-4.0/src/machineconfig/jobs/installer/linux_scripts/ngrok.sh

@@ -0,0 +1,6 @@
+curl -sSL https://ngrok-agent.s3.amazonaws.com/ngrok.asc \
+  | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null \
+  && echo "deb https://ngrok-agent.s3.amazonaws.com bookworm main" \
+  | sudo tee /etc/apt/sources.list.d/ngrok.list \
+  && sudo apt update \
+  && sudo apt install ngrok

{machineconfig-3.99 → machineconfig-4.0}/src/machineconfig/jobs/installer/packages_custom_dev.json

@@ -1,6 +1,24 @@
 {
   "version": "1",
   "installers": [
+    {
+      "appName": "ngrok",
+      "repoURL": "CMD",
+      "doc": "Secure introspectable tunnels to localhost",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "ngrok.sh",
+          "windows": "winget install ngrok -s msstore",
+          "macos": "brew install ngrok"
+        },
+        "arm64": {
+          "linux": "ngrok.sh",
+          "windows": "winget install ngrok -s msstore",
+          "macos": "brew install ngrok"
+        }
+      }
+
+    },
     {
       "appName": "Visual Studio Code",
       "repoURL": "CMD",

{machineconfig-3.99 → machineconfig-4.0}/src/machineconfig/scripts/python/share_terminal.py

@@ -19,12 +19,12 @@ reference:
 """
 
 
-def display_terminal_url(local_ip_v4: str, port: int) -> None:
+def display_terminal_url(local_ip_v4: str, port: int, protocol: str = "http") -> None:
     """Display a flashy, unmissable terminal URL announcement."""
     console = Console()
     
     # Create the main message with styling
-    url_text = Text(f"http://{local_ip_v4}:{port}", style="bold bright_cyan underline")
+    url_text = Text(f"{protocol}://{local_ip_v4}:{port}", style="bold bright_cyan underline")
     message = Text.assemble(
         ("🚀 ", "bright_red"),
         ("Terminal is now accessible at: ", "bright_white bold"),
@@ -64,7 +64,11 @@ def install_ttyd():
 def main(
     port: Annotated[Optional[int], typer.Option("--port", "-p", help="Port to run the terminal server on (default: 7681)")] = None,
     username: Annotated[Optional[str], typer.Option("--username", "-u", help="Username for terminal access (default: current user)")] = None,
-    password: Annotated[Optional[str], typer.Option("--password", "-w", help="Password for terminal access (default: from ~/dotfiles/creds/passwords/quick_password)")] = None
+    password: Annotated[Optional[str], typer.Option("--password", "-w", help="Password for terminal access (default: from ~/dotfiles/creds/passwords/quick_password)")] = None,
+    ssl: Annotated[bool, typer.Option("--ssl", "-S", help="Enable SSL")] = False,
+    ssl_cert: Annotated[Optional[str], typer.Option("--ssl-cert", "-C", help="SSL certificate file path")] = None,
+    ssl_key: Annotated[Optional[str], typer.Option("--ssl-key", "-K", help="SSL key file path")] = None,
+    ssl_ca: Annotated[Optional[str], typer.Option("--ssl-ca", "-A", help="SSL CA file path for client certificate verification")] = None
 ) -> None:
     install_ttyd()
     if username is None:
@@ -80,17 +84,44 @@ def main(
     if port is None:
         port = 7681  # Default port for ttyd
 
+    # Handle SSL certificate defaults
+    if ssl:
+        if ssl_cert is None:
+            ssl_cert = str(Path.home().joinpath("dotfiles/creds/passwords/ssl/origin_server/cert.pem"))
+        if ssl_key is None:
+            ssl_key = str(Path.home().joinpath("dotfiles/creds/passwords/ssl/origin_server/key.pem"))
+        
+        # Verify SSL files exist
+        cert_path = Path(ssl_cert)
+        key_path = Path(ssl_key)
+        
+        if not cert_path.exists():
+            raise FileNotFoundError(f"SSL certificate file not found: {ssl_cert}")
+        if not key_path.exists():
+            raise FileNotFoundError(f"SSL key file not found: {ssl_key}")
+        
+        if ssl_ca and not Path(ssl_ca).exists():
+            raise FileNotFoundError(f"SSL CA file not found: {ssl_ca}")
+
     import socket
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     s.connect(('8.8.8.8',80))
     local_ip_v4 = s.getsockname()[0]
     s.close()
 
-    # Display the flashy terminal announcement
-    display_terminal_url(local_ip_v4, port)
+    # Display the flashy terminal announcement  
+    protocol = "https" if ssl else "http"
+    display_terminal_url(local_ip_v4, port, protocol)
+    
+    # Build ttyd command with SSL options
+    ssl_args = ""
+    if ssl:
+        ssl_args = f"--ssl --ssl-cert {ssl_cert} --ssl-key {ssl_key}"
+        if ssl_ca:
+            ssl_args += f" --ssl-ca {ssl_ca}"
     
     code = f"""#!/bin/bash
-ttyd --writable -t enableSixel=true --port {port} --credential "{username}:{password}" -t 'theme={{"background": "black"}}' bash
+ttyd --writable -t enableSixel=true {ssl_args} --port {port} --credential "{username}:{password}" -t 'theme={{"background": "black"}}' bash
 """
     import subprocess
     subprocess.run(code, shell=True, check=True)

{machineconfig-3.99 → machineconfig-4.0/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.99
+Version: 4.0
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-3.99 → machineconfig-4.0}/src/machineconfig.egg-info/SOURCES.txt

@@ -74,6 +74,7 @@ src/machineconfig/jobs/installer/linux_scripts/docker.sh
 src/machineconfig/jobs/installer/linux_scripts/docker_start.sh
 src/machineconfig/jobs/installer/linux_scripts/edge.sh
 src/machineconfig/jobs/installer/linux_scripts/nerdfont.sh
+src/machineconfig/jobs/installer/linux_scripts/ngrok.sh
 src/machineconfig/jobs/installer/linux_scripts/pgsql.sh
 src/machineconfig/jobs/installer/linux_scripts/redis.sh
 src/machineconfig/jobs/installer/linux_scripts/timescaledb.sh