pleroma

commit: fcc941adfd6741fd645ca3d232e24f1c68c3d65d
parent: d7c2909ce2e488e049a04ba6ba2a79d392d60bde
Author: lambda <pleromagit@rogerbraun.net>
Date:   Tue, 10 Apr 2018 08:14:38 +0000

Merge branch 'patch-1' into 'develop'

Indentation for Apache vhost

See merge request pleroma/pleroma!105
Diffstat:
M
installation/pleroma-apache.conf
49
++++++++++++++++++++++++-------------------------

1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
@@ -1,27 +1,26 @@
 <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
-
+    #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>