about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2016-11-30 23:18:30 +0100
committerGitHub <noreply@github.com>2016-11-30 23:18:30 +0100
commit0768c2825fc2d8f4ee30d7afc826d12aaf62b782 (patch)
tree3a7bf2c6066f59ebb1e29c330515d89386fcf3e7
parent6ff93845d55eb34fc8beceb0c2dde06860c1eb47 (diff)
parent5c2ea4da7d7e64278b6cb8981400d9f0f2e717bc (diff)
Merge pull request #320 from alexgleason/readme-nginx
Guide readers to production wiki page after Docker setup
-rw-r--r--README.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/README.md b/README.md
index 00472a616..59741e0c9 100644
--- 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