Merge 0613ca3001 into 909d81923e

docs/Running-Mastodon/Production-guide.md

@@ -68,6 +68,32 @@ server {
   error_page 500 501 502 503 504 /500.html;
 }
 ```
+## Apache 2
+
+And an example for Apache 2.
+
+```apache2
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+	ServerName example.com
+	ServerAdmin someone@example.com
+    
+	ProxyPreserveHost On
+	ProxyPass / http://localhost:3000/
+	ProxyPassReverse / http://localhost:3000/		
+	RequestHeader set X-Forwarded-Proto "https"
+
+	ErrorLog ${APACHE_LOG_DIR}/social-error.log
+	CustomLog ${APACHE_LOG_DIR}/social-access.log combined
+
+    RewriteEngine on
+    SSLCertificateFile /etc/letsencrypt/live/example.com/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/example.com/privkey.pem
+    Include /etc/letsencrypt/options-ssl-apache.conf
+</VirtualHost>
+</IfModule>
+```
+
 
 ## Running in production without Docker
 

docs/Using-Mastodon/List-of-Mastodon-instances.md

@@ -37,5 +37,6 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz)
 | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No|
 | [manowar.social](https://manowar.social)|N/A|No|No|
 | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No|
+| [social.nervestaple.com](https://social.nervestaple.com)|N/A|Yes|No|
 
 Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request).