Merge branch 'develop' into 'develop'

Apache config for everything on one host.

See merge request pleroma/pleroma!103

installation/pleroma-apache.conf

@@ -0,0 +1,27 @@
+<VirtualHost *:80>
+#Example configuration for when Apache httpd and Pleroma are on the same host.
+#Needed modules: proxy proxy_http proxy_wstunnel rewrite
+#This assumes a Debian style Apache config. Put this in /etc/apache2/sites-available
+#Doesn't include SSL, just run certbot and let it take care of that.
+
+
+#Change this:
+ServerName pleroma.example.com
+
+RewriteEngine On
+RewriteCond %{HTTP:Connection} Upgrade [NC]
+RewriteCond %{HTTP:Upgrade} websocket [NC]
+RewriteRule /(.*) ws://localhost:4000/$1 [P,L]
+
+ProxyRequests off
+ProxyPass / http://localhost:4000/
+ProxyPassReverse / http://localhost:4000/
+
+#Change this too:
+RequestHeader set Host "pleroma.example.com"
+ProxyPreserveHost On
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+</VirtualHost>