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 6c00aa58db15cfb14c7390fae2e8d8c7ca3898bb..8f03509d0aed255ae901bd5bdb8ed636608e7e56 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -5,12 +5,13 @@ 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")
 
+# This flag is used during testing to allow use of in-memory SQLite
+# databases. It is not recommended to be used on a running instance.
+run_migrations = boolean(default=False)
+
 # Where temporary files used in processing and etc are kept
 workbench_path = string(default="%(here)s/user_dev/media/workbench")
 
@@ -22,9 +23,10 @@ direct_remote_path = string(default="/mgoblin_static/")
 
 # set to false to enable sending notices
 email_debug_mode = boolean(default=True)
+email_smtp_use_ssl = boolean(default=False)
 email_sender_address = string(default="notice@mediagoblin.example.org")
 email_smtp_host = string(default='')
-email_smtp_port = integer(default=25)
+email_smtp_port = integer(default=0)
 email_smtp_user = string(default=None)
 email_smtp_pass = string(default=None)
 
@@ -61,6 +63,7 @@ csrf_cookie_name = string(default='mediagoblin_csrftoken')
 push_urls = string_list(default=list())
 
 exif_visible = boolean(default=False)
+original_date_visible = boolean(default=False)
 
 # Theming stuff
 theme_install_dir = string(default="%(here)s/user_dev/themes/")
@@ -68,6 +71,16 @@ theme_web_path = string(default="/theme_static/")
 theme_linked_assets_dir = string(default="%(here)s/user_dev/theme_static/")
 theme = string()
 
+# plugin default assets directory
+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")
@@ -109,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"))
@@ -129,7 +142,7 @@ spectrogram_fft_size = integer(default=4096)
 thumbnail_font = string(default=None)
 
 [media_type:mediagoblin.media_types.pdf]
-pdf_js = boolean(default=False)
+pdf_js = boolean(default=True)
 
 
 [celery]
@@ -139,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()