From 8fd75d54865c8a93f848722242d66001a58b903c Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 18 Jan 2015 00:38:33 +0100
Subject: [PATCH 1/2] define proper allauth production settings

---
 docs/changelog.rst                                 | 2 ++
 gnuviechadmin/gnuviechadmin/settings/base.py       | 2 ++
 gnuviechadmin/gnuviechadmin/settings/production.py | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bb29dde..1e6a9aa 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* :bug:`-` define proper production settings
+
 * :release:`0.5.1 <2015-01-18>`
 * :bug:`-` load jquery and html5 with same URL schema as the rest of the site
 
diff --git a/gnuviechadmin/gnuviechadmin/settings/base.py b/gnuviechadmin/gnuviechadmin/settings/base.py
index 913c1cd..8c6a359 100644
--- a/gnuviechadmin/gnuviechadmin/settings/base.py
+++ b/gnuviechadmin/gnuviechadmin/settings/base.py
@@ -278,6 +278,8 @@ MESSAGE_TAGS = {
 
 
 ########## ALLAUTH CONFIGURATION
+ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
 LOGIN_REDIRECT_URL = '/'
 SOCIALACCOUNT_QUERY_EMAIL = True
 ########## END ALLAUTH CONFIGURATION
diff --git a/gnuviechadmin/gnuviechadmin/settings/production.py b/gnuviechadmin/gnuviechadmin/settings/production.py
index e0c62a4..257a9df 100644
--- a/gnuviechadmin/gnuviechadmin/settings/production.py
+++ b/gnuviechadmin/gnuviechadmin/settings/production.py
@@ -26,3 +26,8 @@ SERVER_EMAIL = get_env_variable('GVA_SITE_ADMINMAIL')
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#caches
 #CACHES = {}
 ########## END CACHE CONFIGURATION
+
+########## ALLAUTH PRODUCTION CONFIGURATION
+ACCOUNT_EMAIL_SUBJECT_PREFIX = '[Jan Dittberner IT-Consulting & -Solutions] '
+ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https'
+########## END ALLAUTH PRODUCTION CONFIGURATION

From 35d84d7f18dab76e06fcd7caf0b4b44be6dfd0f6 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 18 Jan 2015 00:50:43 +0100
Subject: [PATCH 2/2] finish release 0.5.2 docs

---
 docs/changelog.rst | 4 +++-
 docs/conf.py       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1e6a9aa..1cfa8bd 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,9 @@
 Changelog
 =========
 
-* :bug:`-` define proper production settings
+* :release:`0.5.2 <2015-01-18>`
+* :bug:`-` define proper allauth production settings with https and mandatory
+  email verification
 
 * :release:`0.5.1 <2015-01-18>`
 * :bug:`-` load jquery and html5 with same URL schema as the rest of the site
diff --git a/docs/conf.py b/docs/conf.py
index cfc1628..d90a30a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -62,7 +62,7 @@ copyright = u'2014, 2015 Jan Dittberner'
 # The short X.Y version.
 version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.1'
+release = '0.5.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.