Skip to content

Commit

Permalink
Merge pull request #60 from lionleaf/backup
Browse files Browse the repository at this point in the history
Add dbbackup
  • Loading branch information
lionleaf authored Aug 18, 2016
2 parents 8fff39e + f8292e5 commit c075562
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ dwitter/static/CACHE/*
.gitignore
.*.sw*
venv/*
static/*
backups/*
*.iml
backup*.json
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ run:

.PHONY: update
update:
pip install -r requirements.txt
pip install --upgrade -r requirements.txt

.PHONY: migrate
migrate:
Expand Down
4 changes: 4 additions & 0 deletions dwitter/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',),
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c075562

Please sign in to comment.