Patch by Sturm: explain permissions on media directories in deployment docs

[mediagoblin.git] / docs / source / siteadmin / deploying.rst

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 741e96551622c229256a7c501776b1461c87f388..8356f4ba750357b7a4cce93caea0753dac13a8b8 100644 (file)
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -200,20 +200,24 @@ Clone the MediaGoblin repository and set up the git submodules::
 
 And set up the in-package virtualenv::
 
-    (virtualenv --python=python2 --system-site-packages . || virtualenv --python=python22 .) && ./bin/python setup.py develop
+    (virtualenv --python=python2 --system-site-packages . || virtualenv --python=python2 .) && ./bin/python setup.py develop
 
 .. note::
 
    We presently have an **experimental** make-style deployment system.  if
    you'd like to try it, instead of the above command, you can run::
 
-     ./experimental-bootstrap.sh && ./configure && make
+     ./bootstrap.sh && ./configure && make
 
    This also includes a number of nice features, such as keeping your
    viratualenv up to date by simply running `make update`.
 
    Note: this is liable to break.  Use this method with caution.
 
+You then need to make a local copy of mediagoblin.ini, if you don't have one::
+
+   cp --no-clobber mediagoblin.example.ini mediagoblin.ini
+
 The above provides an in-package install of ``virtualenv``. While this
 is counter to the conventional ``virtualenv`` configuration, it is
 more reliable and considerably easier to configure and illustrate. If
@@ -384,6 +388,18 @@ this ``nginx.conf`` file should be modeled on the following::
      }
     }
 
+The first four ``location`` directives instruct Nginx to serve the
+static and uploaded files directly rather than through the MediaGoblin
+process. This approach is faster and requires less memory.
+
+.. note::
+
+   The user who owns the Nginx process, normally ``www-data``,
+   requires execute permission on the directories ``static``,
+   ``public``, ``theme_static`` and ``plugin_static`` plus all their
+   parent directories. This user also requires read permission on all
+   the files within these directories. This is normally the default.
+
 Now, nginx instance is configured to serve the MediaGoblin
 application. Perform a quick test to ensure that this configuration
 works. Restart nginx so it picks up your changes, with a command that
@@ -429,3 +445,7 @@ Security Considerations
    and restart the server, so that it creates a new secret key.
    All previous sessions will be invalidated.
 
+..
+   Local variables:
+   fill-column: 70
+   End: