Merge pull request #12 from djibon/master

Implement #9 Put changes from introduction_es to django-project-template

Procfile

@@ -1,2 +1,3 @@
-web: gunicorn_django --workers=4 --bind=0.0.0.0:$PORT {{ project_name }}/{{ project_name }}/settings
+
+web: gunicorn  --bind=0.0.0.0:$PORT  {{ project_name }}.wsgi:application  --log-file -
 worker: python manage.py celeryd -E -B --loglevel=INFO

introductions/models.py

@@ -2,6 +2,8 @@
 import string
 
 from django.conf import settings
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.dispatch import receiver
 
@@ -10,6 +12,9 @@
 
 from email_reply_parser import EmailReplyParser
 
+from django.contrib.contenttypes.generic import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
+
 from taggit.managers import TaggableManager
 #http://alexgaynor.net/2010/may/04/cool-new-django-taggit-api/
 from taggit.models import TaggedItemBase
@@ -248,4 +253,4 @@ def process_message(sender, message, **args):
             print "Created an introduction from %s on intro: %s" % (message.from_header, intro.pk)
         else:
             print  "Ignore introduction"
-s
+

project_name/settings/base.py

@@ -6,8 +6,8 @@
 import dj_database_url
 
 import  django.conf.global_settings as DEFAULT_SETTINGS
-
-PROJECT_ROOT = os.path.join(os.path.dirname(__file__), '..', '..')
+PROJECT_ROOT = os.path.abspath(os.path.dirname(__name__))
+#PROJECT_ROOT = os.path.join(os.path.dirname(__file__), '..', '..')
 
 # Modify sys.path to include the lib directory
 sys.path.append(os.path.join(PROJECT_ROOT, "lib"))
@@ -106,7 +106,10 @@
 )
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = os.environ['DJANGO_SECRET_KEY']
+try:
+	SECRET_KEY = os.environ['DJANGO_SECRET_KEY']
+except:
+	SECRET_KEY = "BABABABA"
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -123,7 +126,7 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
+#    'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 ROOT_URLCONF = '{{ project_name }}.urls'
@@ -148,7 +151,7 @@
 
     'classy_mail',
     'compressor',
-    'debug_toolbar',
+#    'debug_toolbar',
     'django_mailbox',
     'django_ses',
     'djcelery',
@@ -180,9 +183,9 @@
 INTERNAL_IPS = ('127.0.0.1', '10.0.2.2')
 
 # django-debug-toolbar settings
-DEBUG_TOOLBAR_CONFIG = {
-    'INTERCEPT_REDIRECTS': False,
-}
+#DEBUG_TOOLBAR_CONFIG = {
+#    'INTERCEPT_REDIRECTS': False,
+#}
 
 THUMBS_GENERATE_ANY_SIZE = True
 
@@ -197,6 +200,9 @@
 PATH_LOG = os.path.join(PATH_DATA, 'logs')
 
 
+#if not os.path.exists(PATH_LOG):
+#    os.mkdir(PATH_LOG)
+
 TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
     'django.core.context_processors.request',
 )

project_name/urls.py

@@ -16,7 +16,8 @@
     url(r'^admin/', include(admin.site.urls)),
     url(r'^admin/django-ses/', include('django_ses.urls')),
     url('', include('social.apps.django_app.urls', namespace='social')),
-    url('', include('introductions.urls', namespace='introductions'))
+    url('', include('introductions.urls', namespace='introductions')),
+    url('', include('eagle_design.urls'))
 
 )
 

requirements.txt

@@ -1,4 +1,4 @@
-Django
+Django==1.5.0
 South
 boto
 django-avatar