Merge branch '297-add-clean-up-option-for-backup-task' into 'master'

Resolve "Add clean up option for backup task"

Closes #297

See merge request AlekSIS/official/AlekSIS!357

aleksis/core/settings.py

@@ -413,6 +413,8 @@ DBBACKUP_COMPRESS_DB = _settings.get("backup.database.compress", True)
 DBBACKUP_ENCRYPT_DB = _settings.get("backup.database.encrypt", DBBACKUP_GPG_RECIPIENT is not None)
 DBBACKUP_COMPRESS_MEDIA = _settings.get("backup.media.compress", True)
 DBBACKUP_ENCRYPT_MEDIA = _settings.get("backup.media.encrypt", DBBACKUP_GPG_RECIPIENT is not None)
+DBBACKUP_CLEANUP_DB = _settings.get("backup.database.clean", True)
+DBBACKUP_CLEANUP_MEDIA = _settings.get("backup.media.clean", True)
 
 IMPERSONATE = {"USE_HTTP_REFERER": True, "REQUIRE_SUPERUSER": True, "ALLOW_SUPERUSER": True}
 

aleksis/core/tasks.py

@@ -19,12 +19,21 @@ def send_notification(notification: int, resend: bool = False) -> None:
 def backup_data() -> None:
     """Backup database and media using django-dbbackup."""
     # Assemble command-line options for dbbackup management command
-    db_options = (["-z"] if settings.DBBACKUP_COMPRESS_DB else []) + (
-        ["-e"] if settings.DBBACKUP_ENCRYPT_DB else []
-    )
-    media_options = (["-z"] if settings.DBBACKUP_COMPRESS_MEDIA else []) + (
-        ["-e"] if settings.DBBACKUP_ENCRYPT_MEDIA else []
-    )
+    db_options = []
+    if settings.DBBACKUP_COMPRESS_DB:
+        db_options.append("-z")
+    if settings.DBBACKUP_ENCRYPT_DB:
+        db_options.append("-e")
+    if settings.DBBACKUP_CLEANUP_DB:
+        db_options.append("-c")
+
+    media_options = []
+    if settings.DBBACKUP_COMPRESS_MEDIA:
+        media_options.append("-z")
+    if settings.DBBACKUP_ENCRYPT_MEDIA:
+        media_options.append("-e")
+    if settings.DBBACKUP_CLEANUP_MEDIA:
+        media_options.append("-c")
 
     # Hand off to dbbackup's management commands
     management.call_command("dbbackup", *db_options)