Fixing nginx.conf, adding nginx config update to releases.md.

[lemmy.git] / ansible / templates / nginx.conf

diff --git a/ansible/templates/nginx.conf b/ansible/templates/nginx.conf
index 0a420d77797a8ac5e23a6c565e8ad2510546e2f4..b710fdb30bde9bf543afd572ccf44d1c70c10c9c 100644 (file)
--- a/ansible/templates/nginx.conf
+++ b/ansible/templates/nginx.conf
@@ -1,3 +1,5 @@
+proxy_cache_path /var/cache/lemmy_frontend levels=1:2 keys_zone=lemmy_frontend_cache:10m max_size=100m                 use_temp_path=off;
+
 server {
     listen 80;
     server_name {{ domain }};
@@ -34,7 +36,7 @@ server {
     # It might be nice to compress JSON, but leaving that out to protect against potential
     # compression+encryption information leak attacks like BREACH.
     gzip on;
-    gzip_types text/css application/javascript;
+    gzip_types text/css application/javascript image/svg+xml;
     gzip_vary on;
 
     # Only connect to this site via HTTPS for the two years
@@ -46,8 +48,8 @@ server {
     add_header X-Frame-Options "DENY";
     add_header X-XSS-Protection "1; mode=block";
 
-    # Upload limit for pictshare
-    client_max_body_size 50M;
+    # Upload limit for pictrs
+    client_max_body_size 20M;
 
     location / {
         proxy_pass http://0.0.0.0:8536;
@@ -59,17 +61,37 @@ server {
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
+
+        # Proxy Cache
+        proxy_cache             lemmy_frontend_cache;
+        proxy_cache_use_stale   error timeout http_500 http_502 http_503 http_504;
+        proxy_cache_revalidate  on;
+        proxy_cache_lock        on;
+        proxy_cache_min_uses    5;
     }    
 
-    location /pictshare/ {
-      proxy_pass http://0.0.0.0:8537/;
+    # Redirect pictshare images to pictrs
+    location ~ /pictshare/(.*)$ {
+      return 301 /pictrs/image/$1;
+    }
+
+    # pict-rs images
+    location /pictrs {
+      location /pictrs/image {
+        proxy_pass http://0.0.0.0:8537/image;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      }
+      # Block the import
+      return 403;
+    }
+
+    location /iframely/ {
+      proxy_pass http://0.0.0.0:8061/;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header Host $host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      if ($request_uri ~ \.(?:ico|gif|jpe?g|png|webp|bmp|mp4)$) {
-        add_header Cache-Control "public, max-age=31536000, immutable";
-      }   
     }
 }
 
@@ -84,4 +106,4 @@ map $remote_addr $remote_addr_anon {
 }
 log_format main '$remote_addr_anon - $remote_user [$time_local] "$request" '
 '$status $body_bytes_sent "$http_referer" "$http_user_agent"';
-access_log /dev/stdout main;
+access_log /var/log/nginx/access.log main;