Merge branch 'patch-1' into 'develop'

Indentation for Apache vhost

See merge request pleroma/pleroma!105

installation/pleroma-apache.conf

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