From f3e1376982af2eae1b68e03aabc8c3a53cfa59a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20L=C3=B8ve=20Selvik?= <andreas.l.selvik@gmail.com>
Date: Wed, 17 Aug 2016 18:32:22 -0700
Subject: [PATCH 1/2] Fix django version to use the newest 1.8 release not
 1.8.0

---
 Makefile         | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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/requirements.txt b/requirements.txt
index 6b288688..0cbd1027 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-django==1.8
+django<1.9
 django-registration-redux==1.2
 django-subdomains==2.1.0rc0
 djangorestframework==3.3.3

From f8292e52ad3ae048f851a1e9363f0134e197c77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20L=C3=B8ve=20Selvik?= <andreas.l.selvik@gmail.com>
Date: Wed, 17 Aug 2016 18:34:25 -0700
Subject: [PATCH 2/2] Add dbbackup for database backups

---
 .gitignore               | 2 +-
 dwitter/settings/base.py | 4 ++++
 requirements.txt         | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

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/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 0cbd1027..a229db52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,5 @@ djangorestframework==3.3.3
 django-anymail==0.3.1
 django-filter==0.13
 django-compressor==2.1
+django-dbbackup==2.5.0
 flake8