From: Olivier Larchevêque <olivier.larcheveque@auf.org>
Date: Tue, 13 Mar 2012 18:56:26 +0000 (-0400)
Subject: 1.5
X-Git-Tag: v2.0~5
X-Git-Url: https://git.auf.org/?p=auf_recipe_django.git;a=commitdiff_plain;h=75eeae4d9c0c4961653853163a2e32e43ecbe2f8

1.5
---

diff --git a/CHANGES b/CHANGES
index 6ca09aa..cc667d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.5
+===
+
+* cacher la SECRET_KEY
+
+* sitestatic au lieu de static
+
 1.4
 ===
 
diff --git a/auf/recipe/django/boilerplate.py b/auf/recipe/django/boilerplate.py
index 4a98ca9..abea9a5 100644
--- a/auf/recipe/django/boilerplate.py
+++ b/auf/recipe/django/boilerplate.py
@@ -136,15 +136,14 @@ TIME_ZONE = 'America/Montreal'
 
 LANGUAGE_CODE = 'fr-ca'
 
-MEDIA_ROOT = os.path.join(os.path.dirname(__file__), 'media')
+PROJECT_ROOT = os.path.dirname(__file__)
+
+MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
 MEDIA_URL = '/media/'
 
-STATIC_ROOT = os.path.join(os.path.dirname(__file__), 'static')
+STATIC_ROOT = os.path.join(PROJECT_ROOT, 'sitestatic')
 STATIC_URL = '/static/'
 
-# Don't share this with anybody.
-SECRET_KEY = '%(secret)s'
-
 ROOT_URLCONF = '%(urlconf)s'
 
 INSTALLED_APPS = (
diff --git a/setup.py b/setup.py
index 7d5294a..8807c18 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,7 @@
 from setuptools import setup, find_packages
-import sys, os
 
 name = 'auf.recipe.django'
-version = '1.4'
+version = '1.5'
 
 setup(name=name,
       version=version,