Merge lp:~phanatic/django-configglue/django-1.3.1-support into lp:django-configglue

[Szilveszter Farkas]

The security release of Django 1.3.1 introduced a new setting, I added that to the schema.

The security release of Django 1.3.1 introduced a new setting, I added that to the schema.

[Ricardo Kirkner (ricardokirkner)]

LGTM. Thanks for the help!

review: Approve

=== modified file 'django_configglue/schema.py'
--- django_configglue/schema.py	2011-10-02 14:53:32 +0000
+++ django_configglue/schema.py	2011-10-02 17:47:23 +0000
@@ -1108,6 +1108,23 @@
                  "Examples: 'http://foo.com/media/', '/media/'")
 
 
+class Django131Schema(Django13Schema):
+    version = '1.3.1'
+
+    # sections
+    class django(Django13Schema.django):
+
+        ################
+        # CORE         #
+        ################
+
+        use_x_forwarded_host = BoolOption(default=False,
+            help="A boolean that specifies whether to use the "
+                 "X-Forwarded-Host header in preference to the Host header. "
+                 "This should only be enabled if a proxy which sets this "
+                 "header is in use.")
+
+
 class DjangoSchemaFactory(object):
     def __init__(self):
         self._schemas = {}
@@ -1215,3 +1232,4 @@
 schemas.register(Django112Schema, '1.1.4')
 schemas.register(Django125Schema)
 schemas.register(Django13Schema)
+schemas.register(Django131Schema)