Merge branch 'master' into OPW-Moderation-Update

[mediagoblin.git] / mediagoblin / config_spec.ini

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 12af2f57ab767444474879e341388eecce644eb2..8f03509d0aed255ae901bd5bdb8ed636608e7e56 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -5,9 +5,6 @@ html_title = string(default="GNU MediaGoblin")
 # link to source for this MediaGoblin site
 source_link = string(default="https://gitorious.org/mediagoblin/mediagoblin")
 
-# Enabled media types
-media_types = string_list(default=list("mediagoblin.media_types.image"))
-
 # database stuff
 sql_engine = string(default="sqlite:///%(here)s/mediagoblin.db")
 
@@ -78,6 +75,12 @@ theme = string()
 plugin_web_path = string(default="/plugin_static/")
 plugin_linked_assets_dir = string(default="%(here)s/user_dev/plugin_static/")
 
+[jinja2]
+# Jinja2 supports more directives than the minimum required by mediagoblin. 
+# This setting allows users creating custom templates to specify a list of
+# additional extensions they want to use.  example value:
+# extensions = jinja2.ext.loopcontrols , jinja2.ext.with_
+extensions = string_list(default=list())
 
 [storage:publicstore]
 storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
@@ -119,7 +122,7 @@ vp8_quality = integer(default=8)
 vorbis_quality = float(default=0.3)
 
 # Autoplay the video when page is loaded?
-auto_play = boolean(default=True)
+auto_play = boolean(default=False)
 
 [[skip_transcode]]
 mime_types = string_list(default=list("video/webm"))
@@ -149,7 +152,7 @@ CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db")
 
 # default kombu stuff
 BROKER_TRANSPORT = string(default="sqlalchemy")
-BROKER_HOST = string(default="sqlite:///%(here)s/kombu.db")
+BROKER_URL = string(default="sqlite:///%(here)s/kombu.db")
 
 # known booleans
 CELERY_RESULT_PERSISTENT = boolean()