deployment fixes

backend/README.md

@@ -71,12 +71,11 @@ OIDC_CLOCK_SKEW_SECONDS=30
 SSH_HOST=media-server.example.com
 SSH_USERNAME=username
 SSH_PORT=22
-# In Docker Compose, mount ./secrets/ssh to /root/.ssh inside the backend container.
-# The app uses SSH_KEY_DIRECTORY + SSH_KEY_NAME to build the full key path.
+# Host-side directory mounted into the backend container at /root/.ssh.
+SSH_KEY_HOST_DIR=/absolute/path/to/your/ssh-dir
+# Container-side path assembled by the app:
 SSH_KEY_DIRECTORY=/root/.ssh
 SSH_KEY_NAME=id_ed25519
-# Optional legacy override if you want to provide the full path directly.
-# SSH_KEY_FILENAME=/root/.ssh/id_ed25519
 SSH_PASSWORD=
 
 REMOTE_MEDIA_ROOT=/srv/media

backend/src/media_library_viewer_api/config.py

@@ -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"}

backend/src/media_library_viewer_api/dependencies.py

@@ -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:

backend/src/media_library_viewer_api/logging_utils.py

@@ -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),

backend/tests/test_config.py

@@ -15,6 +15,9 @@ class TestSettings:
             assert settings.jellyseerr_url == ""
             assert settings.log_level == "INFO"
             assert settings.remote_media_root == ""
+            assert settings.ssh_key_directory == ""
+            assert settings.ssh_key_name == ""
+            assert settings.ssh_key_path == ""
 
     def test_from_env(self):
         env = {
@@ -51,3 +54,9 @@ class TestSettings:
         with patch.dict(os.environ, env, clear=True):
             settings = Settings(_env_file=None)
             assert settings.path_prefix == "/srv"
+
+    def test_ssh_key_path_joins_directory_and_name(self):
+        env = {"SSH_KEY_DIRECTORY": "/root/.ssh", "SSH_KEY_NAME": "id_ed25519"}
+        with patch.dict(os.environ, env, clear=True):
+            settings = Settings(_env_file=None)
+            assert settings.ssh_key_path == "/root/.ssh/id_ed25519"