Merge lp:~nicopace/charms/trusty/python-django/allowed_host_patch into lp:charms/python-django

[nicopace]

there is a bug that rised when implementing gunicorn tests, that showed a 400 error on every request to gunicorn published python-django charm.
While I was digging over that bug, i discovered that, despite the documentation stated that if you don't specify a django_allowed_hosts config value, the default would be the FQDN and IP Address of the host, but it wasn't working that way.
This patch solves that problem.

[Kevin W Monroe (kwmonroe)]

I was able to verify the 400 errors without your changes, and I saw the default hostname/fqdn/ip were not being set in ./juju-settings/30-allowed.py.

I then applied your changes and verified successful page requests as well as correct defaults in 30-allowed.py when django_allowed_hosts is empty.

We'll get an official ~charmer ack soon, but until then, +1 LGTM. Thanks for the fix!

review: Approve

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-01-08 00:35:37 +0000
+++ hooks/hooks.py	2015-04-01 17:37:18 +0000
@@ -370,7 +370,8 @@
     dst = os.path.join(settings_dir_path, '30-allowed.py')
     ip = run('unit-get public-address').strip()
     allowed = [socket.gethostname(), socket.getfqdn(), ip]
-    if 'django_allowed_hosts' in config_data:
+    if 'django_allowed_hosts' in config_data and \
+            config_data['django_allowed_hosts'].strip() != '':
         allowed = config_data['django_allowed_hosts'].split(' ')
     process_template('allowed_hosts.tmpl', {'allowed_hosts': allowed}, dst)