Fixed import_export

[mediagoblin.git] / mediagoblin.ini

diff --git a/mediagoblin.ini b/mediagoblin.ini
index e889646abeb73824dd17aefa774e6b9ac35b06b1..dbde6e5106e6013222815f0b2346615cd9f26e5a 100644 (file)
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -1,7 +1,7 @@
+# If you want to make changes to this file, first copy it to
+# mediagoblin_local.ini, then make the changes there.
+
 [mediagoblin]
-queuestore_base_dir = %(here)s/user_dev/media/queue
-publicstore_base_dir = %(here)s/user_dev/media/public
-publicstore_base_url = /mgoblin_media/
 direct_remote_path = /mgoblin_static/
 email_sender_address = "notice@mediagoblin.example.org"
 
@@ -11,8 +11,18 @@ email_debug_mode = true
 # Set to false to disable registrations
 allow_registration = true
 
+## Uncomment this to turn on video or enable other media types
+# media_types = mediagoblin.media_types.image, mediagoblin.media_types.video
+
 ## Uncomment this to put some user-overriding templates here
 #local_templates = %(here)s/user_dev/templates/
 
+[storage:queuestore]
+base_dir = %(here)s/user_dev/media/queue
+
+[storage:publicstore]
+base_dir = %(here)s/user_dev/media/public
+base_url = /mgoblin_media/
+
 [celery]
 # Put celery stuff here