Skip to content
Snippets Groups Projects
Commit b9b8f819 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files
parent 553117fe
No related branches found
No related tags found
No related merge requests found
Pipeline #416 passed with warnings
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")
...@@ -53,7 +53,6 @@ INSTALLED_APPS = [ ...@@ -53,7 +53,6 @@ INSTALLED_APPS = [
"settings_context_processor", "settings_context_processor",
"sass_processor", "sass_processor",
"easyaudit", "easyaudit",
"dbbackup",
"dbsettings", "dbsettings",
"django_cron", "django_cron",
"bootstrap4", "bootstrap4",
...@@ -304,7 +303,7 @@ DBBACKUP_CLEANUP_KEEP = _settings.get("backup.keep.database", 10) ...@@ -304,7 +303,7 @@ DBBACKUP_CLEANUP_KEEP = _settings.get("backup.keep.database", 10)
DBBACKUP_CLEANUP_KEEP_MEDIA = _settings.get("backup.keep.media", 10) DBBACKUP_CLEANUP_KEEP_MEDIA = _settings.get("backup.keep.media", 10)
DBBACKUP_CRON_TIMES = _settings.get("backup.times", None) or ["03:57"] DBBACKUP_CRON_TIMES = _settings.get("backup.times", None) or ["03:57"]
CRON_CLASSES = ["biscuit.core.cronjobs.Backup"] #CRON_CLASSES = ["biscuit.core.cronjobs.Backup"]
ANONYMIZE_ENABLED = _settings.get("maintenance.anonymisable", True) ANONYMIZE_ENABLED = _settings.get("maintenance.anonymisable", True)
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
</ul> </ul>
</div> </div>
<!--
<div class="card"> <div class="card">
<div class="card-header bg-light text-dark"> <div class="card-header bg-light text-dark">
{% blocktrans %}Recent backup cron jobs{% endblocktrans %} {% blocktrans %}Recent backup cron jobs{% endblocktrans %}
...@@ -64,4 +65,5 @@ ...@@ -64,4 +65,5 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
-->
{% endblock %} {% endblock %}
...@@ -268,26 +268,13 @@ version = "0.5.1" ...@@ -268,26 +268,13 @@ version = "0.5.1"
Django = ">=1.8.0" Django = ">=1.8.0"
django-common-helpers = ">=0.6.4" 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]] [[package]]
category = "main" category = "main"
description = "Application settings whose values can be updated while a project is up and running." description = "Application settings whose values can be updated while a project is up and running."
name = "django-dbsettings" name = "django-dbsettings"
optional = false optional = false
python-versions = "*" python-versions = "*"
version = "0.11.0" version = "1.0.0"
[[package]] [[package]]
category = "main" category = "main"
...@@ -759,7 +746,7 @@ description = "Python docstring reStructuredText (RST) validator" ...@@ -759,7 +746,7 @@ description = "Python docstring reStructuredText (RST) validator"
name = "flake8-rst-docstrings" name = "flake8-rst-docstrings"
optional = false optional = false
python-versions = "*" python-versions = "*"
version = "0.0.12" version = "0.0.13"
[package.dependencies] [package.dependencies]
flake8 = ">=3.0.0" flake8 = ">=3.0.0"
...@@ -1646,10 +1633,15 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] ...@@ -1646,10 +1633,15 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
testing = ["pathlib2", "contextlib2", "unittest2"] testing = ["pathlib2", "contextlib2", "unittest2"]
[extras] [extras]
app-alsijil = []
app-chronos = []
app-exlibris = []
app-schild-nrw = []
app-untis = []
ldap = ["django-auth-ldap"] ldap = ["django-auth-ldap"]
[metadata] [metadata]
content-hash = "f453c39e0de04d47e1c53ec8ac5e064a9ad9c2965f9f83c476524d2f867542ab" content-hash = "2ca8d9e0f602b9483857d37440b3a1e5ffabfad285fe8a4484954f2aba36731f"
python-versions = "^3.7" python-versions = "^3.7"
[metadata.files] [metadata.files]
...@@ -1775,11 +1767,8 @@ django-common-helpers = [ ...@@ -1775,11 +1767,8 @@ django-common-helpers = [
django-cron = [ django-cron = [
{file = "django-cron-0.5.1.tar.gz", hash = "sha256:08d22708c8b2ecab8cda989019a66c7e1e2424c59d822796fd45abf7731d261d"}, {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 = [ django-dbsettings = [
{file = "django-dbsettings-0.11.0.tar.gz", hash = "sha256:e3147ced54b7db3371df10df8845e4514aeae96720000bca1a01d0a6490a1404"}, {file = "django-dbsettings-1.0.0.tar.gz", hash = "sha256:42b04dffd3bc90d91718c822f1e0212d9368e8efe340f7ef09517b5fb1cf49f5"},
] ]
django-debug-toolbar = [ django-debug-toolbar = [
{file = "django-debug-toolbar-2.1.tar.gz", hash = "sha256:24c157bc6c0e1648e0a6587511ecb1b007a00a354ce716950bff2de12693e7a8"}, {file = "django-debug-toolbar-2.1.tar.gz", hash = "sha256:24c157bc6c0e1648e0a6587511ecb1b007a00a354ce716950bff2de12693e7a8"},
...@@ -1916,7 +1905,7 @@ flake8-polyfill = [ ...@@ -1916,7 +1905,7 @@ flake8-polyfill = [
{file = "flake8_polyfill-1.0.2-py2.py3-none-any.whl", hash = "sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9"}, {file = "flake8_polyfill-1.0.2-py2.py3-none-any.whl", hash = "sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9"},
] ]
flake8-rst-docstrings = [ flake8-rst-docstrings = [
{file = "flake8-rst-docstrings-0.0.12.tar.gz", hash = "sha256:01d38327801781b26c3dfeb71ae37e5a02c5ca1b774a686f63feab8824ca6f9c"}, {file = "flake8-rst-docstrings-0.0.13.tar.gz", hash = "sha256:b1b619d81d879b874533973ac04ee5d823fdbe8c9f3701bfe802bb41813997b4"},
] ]
gitdb2 = [ gitdb2 = [
{file = "gitdb2-2.0.6-py2.py3-none-any.whl", hash = "sha256:96bbb507d765a7f51eb802554a9cfe194a174582f772e0d89f4e87288c288b7b"}, {file = "gitdb2-2.0.6-py2.py3-none-any.whl", hash = "sha256:96bbb507d765a7f51eb802554a9cfe194a174582f772e0d89f4e87288c288b7b"},
......
...@@ -42,7 +42,6 @@ easy-thumbnails = "^2.6" ...@@ -42,7 +42,6 @@ easy-thumbnails = "^2.6"
django-image-cropping = "^1.2" django-image-cropping = "^1.2"
django-impersonate = "^1.4" django-impersonate = "^1.4"
python-memcached = "^1.59" python-memcached = "^1.59"
django-dbbackup = "^3.2"
django-cron = "^0.5.1" django-cron = "^0.5.1"
django-hattori = "^0.2" django-hattori = "^0.2"
psycopg2 = "^2.8" psycopg2 = "^2.8"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment