deployment fixes

This commit is contained in:
2026-05-04 16:03:39 +02:00
parent ee61007939
commit 26f6f3d41f
11 changed files with 34 additions and 30 deletions
@@ -55,9 +55,8 @@ class Settings(BaseSettings):
ssh_host: str = ""
ssh_username: str = ""
ssh_port: int = 22
ssh_key_directory: str = str(Path.home() / ".ssh")
ssh_key_name: str = "id_rsa"
ssh_key_filename: str = "" # legacy direct override (full path)
ssh_key_directory: str = ""
ssh_key_name: str = ""
ssh_password: str = ""
# Remote paths
@@ -75,8 +74,8 @@ class Settings(BaseSettings):
@property
def ssh_key_path(self) -> str:
if self.ssh_key_filename:
return self.ssh_key_filename
if not self.ssh_key_directory or not self.ssh_key_name:
return ""
return str(Path(self.ssh_key_directory) / self.ssh_key_name)
model_config = {"env_file": ".env", "env_file_encoding": "utf-8", "extra": "ignore"}
@@ -46,18 +46,21 @@ def get_ssh_client() -> RemoteSSHClient:
"""Return a cached SSH client (connects on first use)."""
settings = get_settings()
logger.info(
"Creating SSH client host=%s user=%s port=%s key=%s password=%s",
"Creating SSH client host=%s user=%s port=%s key_dir=%s key_name=%s password=%s",
settings.ssh_host or "<unset>",
settings.ssh_username or "<unset>",
settings.ssh_port,
settings.ssh_key_path or "<unset>",
settings.ssh_key_directory or "<unset>",
settings.ssh_key_name or "<unset>",
"set" if settings.ssh_password else "missing",
)
if not settings.ssh_key_path:
raise RuntimeError("SSH_KEY_DIRECTORY and SSH_KEY_NAME must be configured")
client = RemoteSSHClient(
host=settings.ssh_host,
username=settings.ssh_username,
port=settings.ssh_port,
key_filename=settings.ssh_key_path or None,
key_filename=settings.ssh_key_path,
password=settings.ssh_password or None,
)
try:
@@ -54,7 +54,6 @@ def describe_settings(settings: object) -> dict[str, str]:
"ssh_port": str(getattr(settings, "ssh_port", 22) or 22),
"ssh_key_directory": getattr(settings, "ssh_key_directory", "") or "<unset>",
"ssh_key_name": getattr(settings, "ssh_key_name", "") or "<unset>",
"ssh_key_filename": "set" if getattr(settings, "ssh_key_filename", "") else "missing",
"ssh_password": "set" if getattr(settings, "ssh_password", "") else "missing",
"smtp_host": _sanitize_url(getattr(settings, "smtp_host", "")),
"smtp_port": str(getattr(settings, "smtp_port", 587) or 587),