Always include SSL folder in backups (#136080)

home-assistant · Jan 20, 2025 · 3c534a7 · 3c534a7
1 parent 92b786e
commit 3c534a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/homeassistant/components/hassio/backup.py b/homeassistant/components/hassio/backup.py
@@ -227,11 +227,12 @@ async def async_create_backup(
             include_addons_set = supervisor_backups.AddonSet.ALL
         elif include_addons:
             include_addons_set = set(include_addons)
-        include_folders_set = (
-            {supervisor_backups.Folder(folder) for folder in include_folders}
-            if include_folders
-            else None
-        )
+        include_folders_set = {
+            supervisor_backups.Folder(folder) for folder in include_folders or []
+        }
+        # Always include SSL if Home Assistant is included
+        if include_homeassistant:
+            include_folders_set.add(supervisor_backups.Folder.SSL)
 
         hassio_agents: list[SupervisorBackupAgent] = [
             cast(SupervisorBackupAgent, manager.backup_agents[agent_id])

diff --git a/tests/components/hassio/test_backup.py b/tests/components/hassio/test_backup.py
@@ -673,7 +673,7 @@ async def test_agents_notify_on_mount_added_removed(
         "instance_id": ANY,
         "with_automatic_settings": False,
     },
-    folders=None,
+    folders={"ssl"},
     homeassistant_exclude_database=False,
     homeassistant=True,
     location=[None],
@@ -704,7 +704,7 @@ async def test_agents_notify_on_mount_added_removed(
         ),
         (
             {"include_folders": ["media", "share"]},
-            replace(DEFAULT_BACKUP_OPTIONS, folders={"media", "share"}),
+            replace(DEFAULT_BACKUP_OPTIONS, folders={"media", "share", "ssl"}),
         ),
         (
             {