mastofe

commit: 0768c2825fc2d8f4ee30d7afc826d12aaf62b782
parent: 6ff93845d55eb34fc8beceb0c2dde06860c1eb47
Author: Eugen <eugen@zeonfederated.com>
Date:   Wed, 30 Nov 2016 23:18:30 +0100

Merge pull request #320 from alexgleason/readme-nginx

Guide readers to production wiki page after Docker setup
Diffstat:
M
README.md
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/README.md b/README.md
@@ -60,6 +60,7 @@ Consult the example configuration file, `.env.production.sample` for the full li
 
 - PostgreSQL
 - Redis
+- Nginx
 
 ## Running with Docker and Docker-Compose
 
@@ -83,6 +84,10 @@ The container has two volumes, for the assets and for user uploads. The default 
 
 **Note**: The `--rm` option for docker-compose will remove the container that is created to run a one-off command after it completes. As data is stored in volumes it is not affected by that container clean-up.
 
+### Static files and production
+
+You will also need to set up a static file server when running in production. See the [production guide](https://github.com/Gargron/mastodon/wiki/Production-guide) for a sample Nginx configuration and instructions.
+
 ### Tasks
 
 - `rake mastodon:media:clear` removes uploads that have not been attached to any status after a while, you would want to run this from a periodic cronjob