Merge branch 'sql/dot-notation'

[mediagoblin.git] / mediagoblin / config_spec.ini

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 4d41234686c490a5321ec211a76f9ff76cf82ce5..eb22bc1be3078f04bfb333a29f6a09c4461e1397 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -1,14 +1,18 @@
 [mediagoblin]
+# HTML title of the pages
+html_title = string(default="GNU MediaGoblin")
+
+# Enabled media types
+media_types = string_list(default=list("mediagoblin.media_types.image"))
+
 # database stuff
 db_host = string()
 db_name = string(default="mediagoblin")
 db_port = integer()
 
-
 # Where temporary files used in processing and etc are kept
 workbench_path = string(default="%(here)s/user_dev/media/workbench")
 
-
 # Where mediagoblin-builtin static assets are kept
 direct_remote_path = string(default="/mgoblin_static/")
 
@@ -24,7 +28,6 @@ email_smtp_pass = string(default=None)
 allow_registration = boolean(default=True)
 
 # tag parsing
-tags_delimiter = string(default=",")
 tags_max_length = integer(default=50)
 
 # Whether comments are ascending or descending
@@ -47,6 +50,7 @@ allow_attachments = boolean(default=False)
 # Cookie stuff
 csrf_cookie_name = string(default='mediagoblin_csrftoken')
 
+
 [storage:publicstore]
 storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage")
 base_dir = string(default="%(here)s/user_dev/media/public")
@@ -57,6 +61,11 @@ storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage
 base_dir = string(default="%(here)s/user_dev/media/queue")
 
 
+# Should we keep the original file?
+[media_type:mediagoblin.media_types.video]
+keep_original = boolean(default=False)
+
+
 [beaker.cache]
 type = string(default="file")
 data_dir = string(default="%(here)s/user_dev/beaker/cache/data")