about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Hunsaker <danhunsaker@gmail.com>2017-07-08 18:52:36 -0600
committerEugen Rochko <eugen@zeonfederated.com>2017-07-09 02:52:36 +0200
commitf68fa930ea448f5e94057160cfdcc78fec4aba11 (patch)
tree6af6fca7e891967f19bb0e1cf80e493c37bb99ab
parent007ab330e6ffb1e07995d4e306473d457043e2eb (diff)
[nanobox] Allow Full-size Uploads (#4123)
The Nginx configurations used by Nanobox previously neglected to increase the default upload size limit. This PR bumps that value up to the current Mastodon limit of 8MiB.
-rw-r--r--nanobox/nginx-local.conf6
-rw-r--r--nanobox/nginx-stream.conf.erb4
-rw-r--r--nanobox/nginx-web.conf.erb6
3 files changed, 10 insertions, 6 deletions
diff --git a/nanobox/nginx-local.conf b/nanobox/nginx-local.conf
index 023328733..f56339cac 100644
--- a/nanobox/nginx-local.conf
+++ b/nanobox/nginx-local.conf
@@ -27,8 +27,8 @@ http {
     }
 
     map $http_upgrade $connection_upgrade {
-      default upgrade;
-      ''      close;
+        default upgrade;
+        ''      close;
     }
 
     # Configuration for Nginx
@@ -38,6 +38,8 @@ http {
 
         root /app/public;
 
+        client_max_body_size 8M;
+
         location / {
             try_files $uri @rails;
         }
diff --git a/nanobox/nginx-stream.conf.erb b/nanobox/nginx-stream.conf.erb
index b39d3ff1d..2a047dd9f 100644
--- a/nanobox/nginx-stream.conf.erb
+++ b/nanobox/nginx-stream.conf.erb
@@ -22,8 +22,8 @@ http {
     }
 
     map $http_upgrade $connection_upgrade {
-      default upgrade;
-      ''      close;
+        default upgrade;
+        ''      close;
     }
 
     # Configuration for Nginx
diff --git a/nanobox/nginx-web.conf.erb b/nanobox/nginx-web.conf.erb
index 55245bf28..24cd17cff 100644
--- a/nanobox/nginx-web.conf.erb
+++ b/nanobox/nginx-web.conf.erb
@@ -22,8 +22,8 @@ http {
     }
 
     map $http_upgrade $connection_upgrade {
-      default upgrade;
-      ''      close;
+        default upgrade;
+        ''      close;
     }
 
     # Configuration for Nginx
@@ -36,6 +36,8 @@ http {
 
         root /app/public;
 
+        client_max_body_size 8M;
+
         location / {
             try_files $uri @rails;
         }