From a6197482bcd18bc0364de76a1c9fe375c76d6e2c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@auf.org>
Date: Thu, 23 Aug 2012 09:26:24 -0400
Subject: [PATCH] upgrade django security + raven integration

---
 buildout.cfg        |    1 +
 project/settings.py |   47 ++++++++++++++++++++++++++++++++++++++++++++---
 versions.cfg        |    9 +++++++--
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/buildout.cfg b/buildout.cfg
index 076ff10..759c76f 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -21,6 +21,7 @@ develop = src/qbe
 eggs =
     django
     south
+    raven
     django-admin-tools
     django-ajax-selects
     django-alphafilter
diff --git a/project/settings.py b/project/settings.py
index e7be987..71e1d2f 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -9,9 +9,7 @@ PROJET_TITRE = "Ressources humaines"
 # Rapports d'erreurs
 SERVER_EMAIL = 'ne-pas-repondre@auf.org'
 EMAIL_SUBJECT_PREFIX = '[auf_rh_dae - %s] ' % socket.gethostname()
-ADMINS = (
-    ('Équipe ARI-SI', 'developpeurs@ca.auf.org'),
-)
+ADMINS = ()
 
 MANAGERS = ADMINS
 
@@ -85,6 +83,7 @@ INSTALLED_APPS = (
     'django_qbe',
     'ajax_select',
     'south',
+    'raven',
     'reversion',
     'alphafilter',
     'form_utils',
@@ -194,3 +193,45 @@ QBE_ALLOWED_FIELDS = {'Rh': {
 }}
 
 SOUTH_TESTS_MIGRATE = False
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': True,
+    'root': {
+        'level': 'WARNING',
+        'handlers': ['sentry'],
+    },
+    'formatters': {
+        'verbose': {
+            'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+        },
+    },
+    'handlers': {
+        'sentry': {
+            'level': 'WARNING',
+            'class': 'raven.contrib.django.handlers.SentryHandler',
+        },
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
+            'formatter': 'verbose'
+        }
+    },
+    'loggers': {
+        'django.db.backends': {
+            'level': 'ERROR',
+            'handlers': ['console'],
+            'propagate': False,
+        },
+        'raven': {
+            'level': 'DEBUG',
+            'handlers': ['console'],
+            'propagate': False,
+        },
+        'sentry.errors': {
+            'level': 'DEBUG',
+            'handlers': ['console'],
+            'propagate': False,
+        },
+    },
+}
diff --git a/versions.cfg b/versions.cfg
index b56d9b8..267c447 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -1,5 +1,5 @@
 [versions]
-django = 1.3.1
+django = 1.3.3
 south = 0.7
 django-admin-tools = 0.4.1
 django-ajax-selects = 1.1.4
@@ -17,7 +17,6 @@ pygraphviz = 1.0
 
 # Added by Buildout Versions at 2012-05-09 13:24:49.321297
 auf.django.admingroup = 0.3dev
-auf.recipe.django = 1.7
 buildout-versions = 1.7
 distribute = 0.6.15
 django-debug-toolbar = 0.9.4
@@ -66,3 +65,9 @@ odsgen = 0.1
 
 # Added by Buildout Versions at 2012-07-11 15:30:58.885863
 auf.django.references = 0.21
+
+# Added by Buildout Versions at 2012-08-23 09:19:43.234537
+auf.recipe.django = 2.1
+
+# Added by Buildout Versions at 2012-08-23 09:21:24.235070
+raven = 2.0.4
-- 
1.7.10.4