Merge 8e97f02293 into c442589593

Merge branch 'main' into patch-4
Update nginx.conf
2025-07-12 15:33:14 +00:00 · 2025-07-10 08:04:33 +00:00 · 2024-11-22 14:58:07 +00:00 · 2024-06-11 13:45:08 +09:30 · 2024-06-08 01:05:32 +09:30 · 2024-06-08 01:04:46 +09:30
1 changed files with 1 additions and 0 deletions
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@ -52,6 +52,7 @@ server {
  keepalive_timeout    70;
  sendfile             on;
  client_max_body_size 99m;
  proxy_read_timeout 120; ## Increase if you experience 504 errors uploading media
  root /home/mastodon/live/public;
Author	SHA1	Message	Date
Shlee	47bb9e0031	Merge `8e97f02293` into `c442589593`	2025-07-10 08:04:33 +00:00
Shlee	8e97f02293	Merge branch 'main' into patch-4	2024-11-22 14:58:07 +00:00
Shlee	be28ca5637	Update nginx.conf	2024-06-11 13:45:08 +09:30
Shlee	d91b31200f	Update nginx.conf	2024-06-08 01:05:32 +09:30
Shlee	d774aaf08e	Update nginx.conf	2024-06-08 01:04:46 +09:30
Shlee	a6cb1468c4	Increase nginx.conf proxy_read_timeout	2024-06-08 01:03:29 +09:30