From d75e3d6087598c22c20157347a13ecc219b31b96 Mon Sep 17 00:00:00 2001 From: Komic Date: Tue, 11 Apr 2017 19:38:41 +0200 Subject: [PATCH 1/2] Adding an Apache configuration example (also added my instance) --- Running-Mastodon/Production-guide.md | 43 ++++++++++++++++++++ Using-Mastodon/List-of-Mastodon-instances.md | 1 + 2 files changed, 44 insertions(+) diff --git a/Running-Mastodon/Production-guide.md b/Running-Mastodon/Production-guide.md index 49f3e59b..4c80d606 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -92,6 +92,49 @@ server { } ``` +## Apache + +Setting up Mastodon behind Apache is possible as well, although you will need to enable [mod_proxy_wstunnel](https://httpd.apache.org/docs/trunk/mod/mod_proxy_wstunnel.html) beforehand. The configuration is then pretty straightforward. + +``` + + ServerAdmin contact@example.com + ServerName example.com + Redirect Permanent / https://example.com/ + + + + ServerAdmin contact@example.com + ServerName example.com + + DocumentRoot /home/mastodon/live/public/ + + Header add Strict-Transport-Security "max-age=31536000" + SSLEngine on + SSLProtocol -all +TLSv1.2 + SSLHonorCipherOrder on + SSLCipherSuite EECDH+AESGCM:AES256+EECDH:AES128+EECDH + + SSLCertificateFile example.pem + SSLCertificateKeyFile example.key + + ProxyPreserveHost On + RequestHeader set X-Forwarded-Proto "https" + ProxyPass /500.html ! + ProxyPass /oops.png ! + ProxyPass /api/v1/streaming/ ws://localhost:4000/ + ProxyPassReverse /api/v1/streaming/ ws://localhost:4000/ + ProxyPass / http://localhost:3000/ + ProxyPassReverse / http://localhost:3000/ + + ErrorDocument 500 /500.html + ErrorDocument 501 /500.html + ErrorDocument 502 /500.html + ErrorDocument 503 /500.html + ErrorDocument 504 /500.html + +``` + ## Running in production without Docker It is recommended to create a special user for mastodon on the server (you could call the user `mastodon`), though remember to disable outside login for it. You should only be able to get into that user through `sudo su - mastodon`. diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 49b2c201..96f78654 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -21,6 +21,7 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [masto.razrnet.fr](https://masto.razrnet.fr) |Instance Française pour tout le monde ! Développeurs, gamers, etc...|Yes|No| | [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| +| [from.komic.eu](https://from.komic.eu) |Single user|No|Yes| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| | [mastodon.land](https://mastodon.land) |N/A|Yes|Yes| | [mastodon.partipirate.org](https://mastodon.partipirate.org) |French Pirate Party Instance - Politics and stuff|Yes|No| From 78342aa769035fcb6a7164ea2ce7228106c2bcb4 Mon Sep 17 00:00:00 2001 From: Shel R Date: Wed, 12 Apr 2017 12:21:38 -0400 Subject: [PATCH 2/2] Remove commit to instance list We are no longer maintaining this list. I don't want anyone to see an approved commit to the list and think they should submit PRs to add their instance. --- Using-Mastodon/List-of-Mastodon-instances.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 96f78654..49b2c201 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -21,7 +21,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [masto.razrnet.fr](https://masto.razrnet.fr) |Instance Française pour tout le monde ! Développeurs, gamers, etc...|Yes|No| | [social.diskseven.com](https://social.diskseven.com) |Single user|No|Yes| | [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No|No| -| [from.komic.eu](https://from.komic.eu) |Single user|No|Yes| | [mastodon.xyz](https://mastodon.xyz) |N/A|Yes|Yes| | [mastodon.land](https://mastodon.land) |N/A|Yes|Yes| | [mastodon.partipirate.org](https://mastodon.partipirate.org) |French Pirate Party Instance - Politics and stuff|Yes|No|