Add documentation on changing data dir and Fix stylistic changes

[mediagoblin.git] / mediagoblin.ini

diff --git a/mediagoblin.ini b/mediagoblin.ini
index 6776b07e77c0b6367ac164d504457c19d84e726d..7899d7ca428850df7508aa7c7d9fdd9cbc598e75 100644 (file)
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -1,5 +1,14 @@
 # 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. :)
+
+# To chnange the directory you should make sure you change the
+# directory in paste.ini and/or your webserver configuration.
+#[DEFAULT]
+# data_basedir = "/path/to/data/directory"
 
 [mediagoblin]
 direct_remote_path = /mgoblin_static/
@@ -7,41 +16,44 @@ 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
-## You may have to install dependencies, and will have to run ./bin/dbupdate
-## See http://docs.mediagoblin.org/siteadmin/media-types.html for details.
-# 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/
+# local_templates = %(data_basedir)s/templates/
 
 ## You can set your theme by specifying this (not specifying it will
-## use the default theme).  Run `gmg theme assetlink` to apply the change.
-## The airy theme comes with GMG; please see the theming docs on how to
-## install other themes.
+## use the default theme).  Run `gmg assetlink` to apply the change.
+## The airy and sandyseventiesspeedboat theme comes with GMG; please
+## see the theming docs on how to install other themes.
 # theme = airy
 
-# Should geotagged images be displayed with a map of the location?
-geolocation_map_visible = true
+## If you want the terms of service displayed, you can uncomment this
+# show_tos = true
 
+user_privilege_scheme = "uploader,commenter,reporter"
 [storage:queuestore]
-base_dir = %(here)s/user_dev/media/queue
+base_dir = %(data_basedir)s/media/queue
 
 [storage:publicstore]
-base_dir = %(here)s/user_dev/media/public
+base_dir = %(data_basedir)s/media/public
 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]]