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 91bca8df24ccb202675ec3b6398cd8a5eb6a6f32..8f03509d0aed255ae901bd5bdb8ed636608e7e56 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -5,23 +5,28 @@ 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")
 
+# Where to store cryptographic sensible data
+crypto_path = string(default="%(here)s/user_dev/crypto")
+
 # Where mediagoblin-builtin static assets are kept
 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)
 
@@ -29,7 +34,10 @@ email_smtp_pass = string(default=None)
 allow_registration = boolean(default=True)
 
 # tag parsing
-tags_max_length = integer(default=50)
+tags_max_length = integer(default=255)
+
+# Enable/disable comments
+allow_comments = boolean(default=True)
 
 # Whether comments are ascending or descending
 comments_ascending = boolean(default=True)
@@ -55,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/")
@@ -62,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")
@@ -88,6 +107,8 @@ max_height = integer(default=180)
 [media_type:mediagoblin.media_types.image]
 # One of BICUBIC, BILINEAR, NEAREST, ANTIALIAS
 resize_filter = string(default="ANTIALIAS")
+#level of compression used when resizing images
+quality = integer(default=90)
 
 [media_type:mediagoblin.media_types.video]
 # Should we keep the original file?
@@ -100,6 +121,15 @@ vp8_quality = integer(default=8)
 # Range: -0.1..1
 vorbis_quality = float(default=0.3)
 
+# Autoplay the video when page is loaded?
+auto_play = boolean(default=False)
+
+[[skip_transcode]]
+mime_types = string_list(default=list("video/webm"))
+container_formats = string_list(default=list("Matroska"))
+video_codecs = string_list(default=list("VP8 video"))
+audio_codecs = string_list(default=list("Vorbis"))
+dimensions_match = boolean(default=True)
 
 [media_type:mediagoblin.media_types.audio]
 keep_original = boolean(default=True)
@@ -108,14 +138,11 @@ quality = float(default=0.3)
 create_spectrogram = boolean(default=True)
 spectrogram_fft_size = integer(default=4096)
 
-
 [media_type:mediagoblin.media_types.ascii]
 thumbnail_font = string(default=None)
 
-[beaker.cache]
-type = string(default="file")
-data_dir = string(default="%(here)s/user_dev/beaker/cache/data")
-lock_dir = string(default="%(here)s/user_dev/beaker/cache/lock")
+[media_type:mediagoblin.media_types.pdf]
+pdf_js = boolean(default=True)
 
 
 [celery]
@@ -125,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()