Switch to Python 3 by default.

[mediagoblin.git] / docs / source / siteadmin / production-deployments.rst

diff --git a/docs/source/siteadmin/production-deployments.rst b/docs/source/siteadmin/production-deployments.rst
index b7417213fb7ad563fb5b96ea0e88369f0a7ef200..01794cdf3a96109c69cc001f56810888287a61e9 100644 (file)
--- a/docs/source/siteadmin/production-deployments.rst
+++ b/docs/source/siteadmin/production-deployments.rst
@@ -24,10 +24,10 @@ Deploy with paste
 
 The MediaGoblin WSGI application instance you get with ``./lazyserver.sh`` is
 not ideal for a production MediaGoblin deployment. Ideally, you should be able
-to use a systemd service file or an init script to launch and restart the
+to use a Systemd service file or an init script to launch and restart the
 MediaGoblin process.
 
-We will explore setting up MediaGoblin systemd service files and init scripts,
+We will explore setting up MediaGoblin Systemd service files and init scripts,
 but first we need to create the directory that will store the MediaGoblin logs.
 
 
@@ -45,10 +45,10 @@ proper permissions::
 
 .. _systemd-service-files:
 
-Use systemd service files
+Use Systemd service files
 -------------------------
 
-If your operating system uses systemd, you can use systemd ``service files``
+If your operating system uses Systemd, you can use Systemd ``service files``
 to manage both the Celery and Paste processes. Place the following service
 files in the ``/etc/systemd/system/`` directory.
 
@@ -62,7 +62,7 @@ modify it to suit your environment's setup:
     # If using Fedora/CentOS/Red Hat, mkdir and chown are located in /usr/bin/mkdir and /usr/bin/chown, respectively.
 
     [Unit]
-    Description=Mediagoblin Celeryd
+    Description=MediaGoblin Celeryd
 
     [Service]
     User=mediagoblin
@@ -76,7 +76,7 @@ modify it to suit your environment's setup:
     ExecStartPre=/bin/mkdir -p /run/mediagoblin
     ExecStartPre=/bin/chown -hR mediagoblin:mediagoblin /run/mediagoblin
     # Celery process will run as the `mediagoblin` user after start.
-    Environment=MEDIAGOBLIN_CONFIG=/srv/mediagoblin.example.org/mediagoblin/mediagoblin_local.ini \
+    Environment=MEDIAGOBLIN_CONFIG=/srv/mediagoblin.example.org/mediagoblin/mediagoblin.ini \
                 CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery
     ExecStart=/srv/mediagoblin.example.org/mediagoblin/bin/celery worker \
                   --logfile=/var/log/mediagoblin/celery.log \
@@ -114,7 +114,7 @@ The second file should be named ``mediagoblin-paster.service``:
                   --pid-file=/var/run/mediagoblin/mediagoblin.pid \
                   --log-file=/var/log/mediagoblin/mediagoblin.log \
                   --daemon \
-                  --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=26543
+                  --server-name=main
     ExecStop=/srv/mediagoblin.example.org/mediagoblin/bin/paster serve \
                  --pid-file=/var/run/mediagoblin/mediagoblin.pid \
                  /srv/mediagoblin.example.org/mediagoblin/paste_local.ini stop
@@ -156,7 +156,7 @@ processes again.
 Use an init script
 ------------------
 
-If your system does not use systemd, you can use the following command as the
+If your system does not use Systemd, you can use the following command as the
 basis for an init script:
 
 .. code-block:: bash
@@ -165,7 +165,7 @@ basis for an init script:
      /srv/mediagoblin.example.org/mediagoblin/bin/paster serve \
      /srv/mediagoblin.example.org/mediagoblin/paste.ini \
      --pid-file=/var/run/mediagoblin.pid \
-     --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=26543
+     --server-name=main
 
 The above configuration places MediaGoblin in "always eager" mode
 with Celery, this means that submissions of content will be processed
@@ -181,7 +181,7 @@ as the basis for your script:
      /srv/mediagoblin.example.org/mediagoblin/bin/paster serve \
      /srv/mediagoblin.example.org/mediagoblin/paste.ini \
      --pid-file=/var/run/mediagoblin.pid \
-     --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=26543
+     --server-name=main
 
 
 Members of the MediaGoblin community have provided init scripts for the
@@ -244,7 +244,7 @@ To launch Celery separately from the MediaGoblin WSGI application:
 
         CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery ./bin/celeryd
 
-If you use our example systemd ``service files``, Celery will be set to the
+If you use our example Systemd ``service files``, Celery will be set to the
 "CELERY_ALWAYS_EAGER=false" value by default. This will provide your users
 with the best user experience, as all media processing will be done in the
 background.