polish

diff --git a/.gitignore b/.gitignore
index ebc2ccc..cd308e8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,6 @@
 
 .virtualenv
 
-local_settings.py
+conf.py
 media
 sitestatic

diff --git a/README.rst b/README.rst
index 3ae122f..17cbfe6 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -1,40 +1,26 @@
-Démarrage d'un nouveau projet
+Demarrage d'un nouveau projet
 =============================
 
-* django-admin.py startproject {{ project_name }} --template=<url du squelette> --name=django --name=django.wsgi --name=deploy
-
-* (optionnel) configurer les versions de PYTHON au besoin dans :
-   ./bin/deploy
-   ./bin/django.wsgi
-
-* git init
-
-* git add .
-
-* git commit -m 'nouveau projet'
-
-* git config add remote.origin.url <url du dépôt git>
-
-* git push origin master
+django-admin.py startproject {{ project_name }} --template=<url du squelette> --name=django --name=django.wsgi --name=deploy --name=README.rst
 
 
 Configuration du projet
 =======================
 
-La configuration secrète se trouve dans le fichier:
+La configuration secrete se trouve dans le fichier:
 
-{{ project_name }}/settings/local_settings.py
+conf.py
 
 
-Déploiement du projet
+Deploiement du projet
 =====================
 
-* bin/deploy
+bin/deploy
 
 
-Développement du projet
+Developpement du projet
 =======================
 
-* bin/deploy development
+bin/deploy development
 
-* bin/django runserver --settings={{ project_name }}.settings.development
+bin/django runserver --settings={{ project_name }}.settings.development

diff --git a/bin/deploy b/bin/deploy
index 89890a2..8eaf77c 100755 (executable)
--- a/bin/deploy
+++ b/bin/deploy
@@ -1,6 +1,5 @@
 #! /bin/bash
 
-PYTHON="python2.6"
 ROOT_PATH=.
 PROJECT_NAME="{{ project_name }}"
 
@@ -23,7 +22,7 @@ if [ -e "$VENV_PATH" ]; then
     echo "l'environnement virtuel existe deja."
 else
     echo "Creation de l'environnement virtuel."
-    virtualenv --python=$PYTHON $VENV_PATH
+    virtualenv $VENV_PATH
     rm -f distribute*.tar.gz
 fi
 

diff --git a/bin/django.wsgi b/bin/django.wsgi
index a839962..60f2fb7 100755 (executable)
--- a/bin/django.wsgi
+++ b/bin/django.wsgi
@@ -4,7 +4,8 @@ import os
 import sys
 import site
 
-PYTHON = "python2.6"
+major, minor = sys.version_info
+PYTHON = "python%s.%s" % (major, minor)
 
 os.environ['DJANGO_SETTINGS_MODULE'] = '{{ project_name }}.settings.production'
 

diff --git a/conf.py b/conf.py
new file mode 100644 (file)
index 0000000..036ee87
--- /dev/null
+++ b/conf.py
@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+DATABASES = {
+    'default': {
+        # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'db.sqlite',
+        'USER': '',
+        'PASSWORD': '',
+        'HOST': '',
+        'PORT': '',
+    }
+}
+
+SECRET_KEY = ''
+
+PIWIK_TOKEN = ''
+
+RAVEN_CONFIG = {
+    'dsn': '',
+}

diff --git a/project_name/settings/base.py b/project_name/settings/base.py
index a1f94a7..d5e9ecd 100644 (file)
--- a/project_name/settings/base.py
+++ b/project_name/settings/base.py
@@ -42,6 +42,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.admin',
+    '{{ project_name }}',
     'south',
     'raven.contrib.django',
     'auf.django.pong',
@@ -98,6 +99,6 @@ LOGGING = {
 }
 
 try:
-    from local_settings import *   # NOQA
+    from conf import *   # NOQA
 except ImportError:
     pass

diff --git a/project_name/settings/development.py b/project_name/settings/development.py
index 741cea0..a68577e 100644 (file)
--- a/project_name/settings/development.py
+++ b/project_name/settings/development.py
@@ -2,6 +2,8 @@
 
 from base import *  # NOQA
 
+DEBUG = True
+
 INTERNAL_IPS = ('127.0.0.1',)
 INSTALLED_APPS += ('debug_toolbar',)
 MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)

diff --git a/project_name/settings/local_settings.py b/project_name/settings/local_settings.py
deleted file mode 100644 (file)
index 036ee87..0000000
--- a/project_name/settings/local_settings.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-DATABASES = {
-    'default': {
-        # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'db.sqlite',
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '',
-        'PORT': '',
-    }
-}
-
-SECRET_KEY = ''
-
-PIWIK_TOKEN = ''
-
-RAVEN_CONFIG = {
-    'dsn': '',
-}

diff --git a/project_name/templates/404.html b/project_name/templates/404.html
new file mode 100644 (file)
index 0000000..f1b1cb3
--- /dev/null
+++ b/project_name/templates/404.html
@@ -0,0 +1 @@
+404

diff --git a/project_name/templates/500.html b/project_name/templates/500.html
new file mode 100644 (file)
index 0000000..1b79f38
--- /dev/null
+++ b/project_name/templates/500.html
@@ -0,0 +1 @@
+500