Merge lp:~canonical-ca-hackers/ubuntu-webcatalog/add-use-https into lp:ubuntu-webcatalog

[Łukasz Czyżykowski]

Add os.environ['HTTPS'] to wsgi app creation when should_serve_https config is on.

Unofortunately there's no way of actually testing that, at least nothing I come up with.

Adds code to set os.environ['HTTPS'] = 'on' as this is where django checks for request.is_secure()

=== modified file 'src/webcatalog/wsgi.py'
--- src/webcatalog/wsgi.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/wsgi.py	2012-03-30 13:53:46 +0000
@@ -17,6 +17,7 @@
 
 """wsgi stack for the Apps Directory."""
 
+import os
 import logging.config
 import platform
 
@@ -28,6 +29,9 @@
 
 def make_app():
     """Encapsulate our webcatalog handler in an OOPS app."""
+    if settings.SHOULD_SERVE_HTTPS:
+        os.environ['HTTPS'] = 'on'
+
     default_id = ''.join(x for x in platform.node() if x.isalpha())
     appserver_id = getattr(settings, 'APPSERVER_ID', default_id)
     logging.config.fileConfig(settings.WEBAPP_LOGGING_CONFIG)