diff --git a/.gitignore b/.gitignore index 9616b010..2ac109d3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,6 @@ dwitter/static/CACHE/* .gitignore .*.sw* venv/* -static/* +backups/* *.iml backup*.json diff --git a/Makefile b/Makefile index 2cf46072..9292e432 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ run: .PHONY: update update: - pip install -r requirements.txt + pip install --upgrade -r requirements.txt .PHONY: migrate migrate: diff --git a/dwitter/settings/base.py b/dwitter/settings/base.py index 3354723f..c613e508 100644 --- a/dwitter/settings/base.py +++ b/dwitter/settings/base.py @@ -56,8 +56,12 @@ 'subdomains', 'anymail', 'compressor', + 'dbbackup', ] +DBBACKUP_STORAGE = 'dbbackup.storage.filesystem_storage' +DBBACKUP_STORAGE_OPTIONS = {'location': 'backups'} + REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', 'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',), diff --git a/requirements.txt b/requirements.txt index 6b288688..a229db52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,9 @@ -django==1.8 +django<1.9 django-registration-redux==1.2 django-subdomains==2.1.0rc0 djangorestframework==3.3.3 django-anymail==0.3.1 django-filter==0.13 django-compressor==2.1 +django-dbbackup==2.5.0 flake8