Import MigrationManager from mongo in mongo backend.

[mediagoblin.git] / mediagoblin / app.py

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 7f087ed93e454e2d3ee78f330204022c8be8503e..96b2c8abd9c516622b6ad364e94422597fd2c9c6 100644 (file)
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -63,7 +63,7 @@ class MediaGoblinApp(object):
 
         # Get the template environment
         self.template_loader = get_jinja_loader(
-            app_config.get('user_template_path'))
+            app_config.get('local_templates'))
 
         # Set up storage systems
         self.public_store, self.queue_store = setup_storage()
@@ -122,6 +122,11 @@ class MediaGoblinApp(object):
         # The other option would be:
         # request.full_path = environ["SCRIPT_URL"]
 
+        # Fix up environ for urlgen
+        # See bug: https://bitbucket.org/bbangert/routes/issue/55/cache_hostinfo-breaks-on-https-off
+        if environ.get('HTTPS', '').lower() == 'off':
+            environ.pop('HTTPS')
+
         ## Attach utilities to the request object
         request.matchdict = route_match
         request.urlgen = routes.URLGenerator(self.routing, environ)