Upgrading gunicorn. Referenced issue is resolved.

[mediagoblin.git] / mediagoblin.ini

diff --git a/mediagoblin.ini b/mediagoblin.ini
index 66c9c77c730bd1cbfd7183810e04e5ad33a3836c..fe9d5cd2942d9d545c395ece888b653ae50a6d3e 100644 (file)
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -1,9 +1,9 @@
-# Have a look at mediagoblin/config_spec.ini
-# It defines types and defaults so it’s a good place to look for documentation
-# or to find hidden options that we didn’t tell you about. :)
-
 # If you want to make changes to this file, first copy it to
 # mediagoblin_local.ini, then make the changes there.
+#
+# If you don't see what you need here, have a look at mediagoblin/config_spec.ini
+# It defines types and defaults so it’s a good place to look for documentation
+# or to find hidden options that we didn’t tell you about. :)
 
 [mediagoblin]
 direct_remote_path = /mgoblin_static/
@@ -11,16 +11,17 @@ email_sender_address = "notice@mediagoblin.example.org"
 
 ## Uncomment and change to your DB's appropiate setting.
 ## Default is a local sqlite db "mediagoblin.db".
-# sql_engine = postgresql:///gmg
+## Don't forget to run `./bin/gmg dbupdate` after having changed it.
+# sql_engine = postgresql:///mediagoblin
 
-# set to false to enable sending notices
+# Set to false to enable sending notices
 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
+# Set to false to disable the ability for users to report offensive content
+allow_reporting = true
 
 ## Uncomment this to put some user-overriding templates here
 # local_templates = %(here)s/user_dev/templates/
@@ -31,6 +32,9 @@ allow_registration = true
 ## install other themes.
 # theme = airy
 
+## If you want the terms of service displayed, you can uncomment this
+# show_tos = true
+
 [storage:queuestore]
 base_dir = %(here)s/user_dev/media/queue
 
@@ -41,7 +45,9 @@ base_url = /mgoblin_media/
 [celery]
 # Put celery stuff here
 
-# place plugins here---each in their own subsection of [plugins]. see
-# documentation for details.
+# Place plugins here, each in their own subsection of [plugins].
+# See http://docs.mediagoblin.org/siteadmin/plugins.html for details.
 [plugins]
 [[mediagoblin.plugins.geolocation]]
+[[mediagoblin.plugins.basic_auth]]
+[[mediagoblin.media_types.image]]