Changelog correction and merge.

CHANGELOG.md

@@ -2,10 +2,16 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2015-09-17]
+## [2015-09-22]
 ### Added
 - Add Python version option for deployment (@yunti)
 
+## [2015-09-21]
+### Changed
+- django-mailgun-redux to django-mailgun, because @pydanny now has commit rights
+### Removed
+- Excess "loggers" from LOGGING setting (@siauPatrick)
+
 ## [2015-09-18]
 ### Changed
 - Major reorganization of docs (@pydanny)

CONTRIBUTORS.txt

@@ -46,13 +46,14 @@ Daniele Tricoli / @eriol
 Harry Percival / @hjwp
 Cullen Rhodes / @c-rhodes
 Burhan Khalid / @burhan
-Audrey Roy Greenfeld / @audreyr (and creator/maintainer of cookiecutter) * 
+Audrey Roy Greenfeld / @audreyr (and creator/maintainer of cookiecutter) *
 Jannis Gebauer / @got_nil
 jayfk / @jayfk
-stepmr / @stepmr 
+stepmr / @stepmr
 Adam Bogdał / @bogdal
 Barclay Gauld / @yunti
 Ian Lee / @IanLee1521
+Roman Afanaskin / @siauPatrick
 
 * Possesses commit rights
 

cookiecutter.json

@@ -13,5 +13,6 @@
     "use_celery": "n",
     "use_maildump": "n",
     "use_sentry": "n",
-    "windows": "n"
+    "windows": "n",
+    "use_python2": "n"
 }

{{cookiecutter.repo_name}}/Dockerfile

@@ -1,4 +1,8 @@
+{% if cookiecutter.use_python2 == 'n' -%}
+FROM python:3.4
+{% else %}
 FROM python:2.7
+{%- endif %}
 ENV PYTHONUNBUFFERED 1
 
 # Requirements have to be pulled and installed here, otherwise caching won't work
@@ -20,4 +24,4 @@ RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh
 
 WORKDIR /app
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

{{cookiecutter.repo_name}}/config/settings/common.py

@@ -260,15 +260,13 @@ LOGGING = {
         'django.request': {
             'handlers': ['mail_admins'],
             'level': 'ERROR',
-            'propagate': True,
-        },
-        'loggers': {
-            'django.security.DisallowedHost': {
-                'level': 'ERROR',
-                'handlers': ['console', 'mail_admins'],
-                'propagate': True,
-            },
+            'propagate': True
         },
+        'django.security.DisallowedHost': {
+            'level': 'ERROR',
+            'handlers': ['console', 'mail_admins'],
+            'propagate': True
+        }
     }
 }
 {% if cookiecutter.use_celery == "y" %}

{{cookiecutter.repo_name}}/requirements/production.txt

@@ -17,7 +17,7 @@ Collectfast==0.2.3
 
 # Mailgun Support
 # ---------------
-django-mailgun-redux==0.3.0
+django-mailgun==0.6.0
 
 {% if cookiecutter.use_sentry == "y" -%}
 # Raven is the Sentry client

{{cookiecutter.repo_name}}/runtime.txt

@@ -0,0 +1,3 @@
+{% if cookiecutter.use_python2 == 'n' -%}
+python-3.4.3
+{%- endif %}