From d7df7e3004842595d11438813d81f5bcbf151ad0 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 29 Dec 2019 19:43:07 +0100
Subject: [PATCH] Remove django-dbbackup for now.
https://github.com/django-dbbackup/django-dbbackup/issues/314
---
biscuit/core/cronjobs.py | 18 -----------------
biscuit/core/settings.py | 9 ---------
.../core/templates/core/system_status.html | 20 -------------------
poetry.lock | 16 ---------------
pyproject.toml | 1 -
5 files changed, 64 deletions(-)
delete mode 100644 biscuit/core/cronjobs.py
diff --git a/biscuit/core/cronjobs.py b/biscuit/core/cronjobs.py
deleted file mode 100644
index 2ffe250b7..000000000
--- a/biscuit/core/cronjobs.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.conf import settings
-from django.core import management
-
-from django_cron import CronJobBase, Schedule
-
-
-class Backup(CronJobBase):
- RUN_AT_TIMES = settings.DBBACKUP_CRON_TIMES
- RETRY_AFTER_FAILURE_MINS = 5
-
- schedule = Schedule(
- run_at_times=RUN_AT_TIMES, retry_after_failure_mins=RETRY_AFTER_FAILURE_MINS
- )
- code = "biscuit.core.Backup"
-
- def do(self):
- management.call_command("dbbackup", "-z")
- management.call_command("mediabackup", "-z")
diff --git a/biscuit/core/settings.py b/biscuit/core/settings.py
index 65ab18f80..00767feeb 100644
--- a/biscuit/core/settings.py
+++ b/biscuit/core/settings.py
@@ -53,7 +53,6 @@ INSTALLED_APPS = [
"settings_context_processor",
"sass_processor",
"easyaudit",
- "dbbackup",
"dbsettings",
"django_cron",
"bootstrap4",
@@ -298,14 +297,6 @@ IMPERSONATE = {"USE_HTTP_REFERER": True, "REQUIRE_SUPERUSER": True, "ALLOW_SUPER
DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap4.html"
-DBBACKUP_STORAGE = _settings.get("backup.storage", "django.core.files.storage.FileSystemStorage")
-DBBACKUP_STORAGE_OPTIONS = {"location": _settings.get("backup.location", "/var/backups/biscuit")}
-DBBACKUP_CLEANUP_KEEP = _settings.get("backup.keep.database", 10)
-DBBACKUP_CLEANUP_KEEP_MEDIA = _settings.get("backup.keep.media", 10)
-DBBACKUP_CRON_TIMES = _settings.get("backup.times", None) or ["03:57"]
-
-CRON_CLASSES = ["biscuit.core.cronjobs.Backup"]
-
ANONYMIZE_ENABLED = _settings.get("maintenance.anonymisable", True)
LOGIN_URL = "two_factor:login"
diff --git a/biscuit/core/templates/core/system_status.html b/biscuit/core/templates/core/system_status.html
index 7b8006dd2..45b95d840 100644
--- a/biscuit/core/templates/core/system_status.html
+++ b/biscuit/core/templates/core/system_status.html
@@ -44,24 +44,4 @@
</li>
</ul>
</div>
-
- <div class="card">
- <div class="card-header bg-light text-dark">
- {% blocktrans %}Recent backup cron jobs{% endblocktrans %}
- </div>
- <ul class="list-group list-group-flush">
- {% for backup in backups %}
- <li class="list-group-item d-flex justify-content-between align-items-center">
- <div>
- <p>{{ backup.end_time }}</p>
- </div>
- {% if backup.is_success %}
- <span class="badge badge-success mdi mdi-check"> </span>
- {% else %}
- <span class="badge badge-danger mdi mdi-error"> </span>
- {% endif %}
- </li>
- {% endfor %}
- </ul>
- </div>
{% endblock %}
diff --git a/poetry.lock b/poetry.lock
index 69ee2118c..038d9737c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -268,19 +268,6 @@ version = "0.5.1"
Django = ">=1.8.0"
django-common-helpers = ">=0.6.4"
-[[package]]
-category = "main"
-description = "Management commands to help backup and restore a project database and media"
-name = "django-dbbackup"
-optional = false
-python-versions = "*"
-version = "3.2.0"
-
-[package.dependencies]
-Django = ">=1.5"
-pytz = "*"
-six = "*"
-
[[package]]
category = "main"
description = "Application settings whose values can be updated while a project is up and running."
@@ -1775,9 +1762,6 @@ django-common-helpers = [
django-cron = [
{file = "django-cron-0.5.1.tar.gz", hash = "sha256:08d22708c8b2ecab8cda989019a66c7e1e2424c59d822796fd45abf7731d261d"},
]
-django-dbbackup = [
- {file = "django-dbbackup-3.2.0.tar.gz", hash = "sha256:9470e5d8bdaee4feb878b1b66c59eb9b27a131cccd648bf7cbfe70930acd4fc0"},
-]
django-dbsettings = [
{file = "django-dbsettings-0.11.0.tar.gz", hash = "sha256:e3147ced54b7db3371df10df8845e4514aeae96720000bca1a01d0a6490a1404"},
]
diff --git a/pyproject.toml b/pyproject.toml
index 0e6138a15..6beb59d6d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,7 +42,6 @@ easy-thumbnails = "^2.6"
django-image-cropping = "^1.2"
django-impersonate = "^1.4"
python-memcached = "^1.59"
-django-dbbackup = "^3.2"
django-cron = "^0.5.1"
django-hattori = "^0.2"
psycopg2 = "^2.8"
--
GitLab