diff options
| -rw-r--r-- | installation/pleroma-apache.conf | 49 | ||||
| -rw-r--r-- | installation/pleroma.vcl | 4 |
2 files changed, 24 insertions, 29 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 @@ <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> diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl index e68938803..fe9bf056b 100644 --- a/installation/pleroma.vcl +++ b/installation/pleroma.vcl @@ -48,8 +48,6 @@ sub vcl_recv { # Strip headers that will affect caching from all other static content # This also permits caching of individual toots and AP Activities if ((req.url ~ "^/(media|notice|objects|static)/") || - (req.url ~ "^/(activities/|api/v1/statuses/\d+$)") || - (req.url ~ "^/(activities/|api/v1/statuses/\d+/card$)") || (req.url ~ "(?i)\.(html|js|css|jpg|jpeg|png|gif|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|ttf|pdf|woff|woff2)$")) { unset req.http.Cookie; @@ -102,8 +100,6 @@ sub vcl_backend_response { # Strip cache-restricting headers from Pleroma on static content that we want to cache # Also enable streaming of cached content to clients (no waiting for Varnish to complete backend fetch) if ((bereq.url ~ "^/(notice|objects)/") || - (bereq.url ~ "^/(activities/|api/v1/statuses/\d+$)") || - (bereq.url ~ "^/(activities/|api/v1/statuses/\d+/card$)") || (bereq.url ~ "(?i)\.(js|css|jpg|jpeg|png|gif|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|ttf|pdf|woff|woff2)$")) { unset beresp.http.set-cookie; |