From 73ca18744eaab2329d0d5c98b9fdb620e429c976 Mon Sep 17 00:00:00 2001 From: Stanislas Date: Tue, 10 Apr 2018 08:08:27 +0000 Subject: [PATCH] Indentation for Apache vhost --- installation/pleroma-apache.conf | 49 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf index e45ebf107..bb6d32587 100644 --- a/installation/pleroma-apache.conf +++ b/installation/pleroma-apache.conf @@ -1,27 +1,26 @@ -#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