Merge branch 'client-max-body-size'

Pelckmans · Jan 15, 2020 · ed2c6d0 · ed2c6d0
2 parents 9e4290f + c623f87
commit ed2c6d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/scripts/config/lib/nginx_config.rb b/scripts/config/lib/nginx_config.rb
@@ -12,6 +12,7 @@ class NginxConfig
     basic_auth: false,
     basic_auth_htpasswd_path: "/app/.htpasswd",
     worker_connections: 512,
+    client_max_body_size: "1m",
     resolver: "8.8.8.8",
     logging: {
       "access" => true,
@@ -23,6 +24,7 @@ def initialize(json_file)
     json = {}
     json = JSON.parse(File.read(json_file)) if File.exist?(json_file)
     json["worker_connections"] ||= ENV["WORKER_CONNECTIONS"] || DEFAULT[:worker_connections]
+    json["client_max_body_size"] ||= ENV["CLIENT_MAX_BODY_SIZE"] || DEFAULT[:client_max_body_size]
     json["port"] ||= ENV["PORT"] || 5000
     json["root"] ||= DEFAULT[:root]
     json["encoding"] ||= DEFAULT[:encoding]

diff --git a/scripts/config/templates/nginx.conf.erb b/scripts/config/templates/nginx.conf.erb
@@ -37,6 +37,9 @@ http {
   #Must read the body in 5 seconds.
   client_body_timeout 5;
 
+  #Max body size (think fileuploads)
+  client_max_body_size <%= client_max_body_size %>;
+
   server {
     listen <%= port %> reuseport;
     charset <%= encoding %>;