aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-05-10 11:23:36 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-05-10 11:23:36 -0500
commitfcfcd1f8a3712cfd58889234b7fd40a45c831161 (patch)
treebccc1296bc20c71156b6bfbb6267060d8ed7f0b0
parente5cdd742945e134d87f368aa7064c708f53f3098 (diff)
parent42ce372e38b28d6e01da76b05d6924d04c2710ae (diff)
downloadmediagoblin-fcfcd1f8a3712cfd58889234b7fd40a45c831161.tar.lz
mediagoblin-fcfcd1f8a3712cfd58889234b7fd40a45c831161.tar.xz
mediagoblin-fcfcd1f8a3712cfd58889234b7fd40a45c831161.zip
Merge remote-tracking branch 'refs/remotes/merge-requests/47'
-rw-r--r--docs/source/siteadmin/relnotes.rst14
-rw-r--r--mediagoblin.ini2
2 files changed, 15 insertions, 1 deletions
diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index 6962dc5a..04863ec6 100644
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -100,7 +100,19 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system.
**Do this to upgrade**
-1. Make sure to run ``bin/gmg dbupdate`` after upgrading.
+ # directory of your mediagoblin install
+ cd /srv/mediagoblin.example.org
+
+ # copy source for this release
+ git fetch
+ git checkout tags/v0.3.2
+
+ # perform any needed database updates
+ bin/gmg dbupdate
+
+ # restart your servers however you do that, e.g.,
+ sudo service mediagoblin-paster restart
+ sudo service mediagoblin-celeryd restart
**New features**
diff --git a/mediagoblin.ini b/mediagoblin.ini
index bed69737..43621107 100644
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -20,6 +20,8 @@ email_debug_mode = true
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
## Uncomment this to put some user-overriding templates here