[ARVADOS] updated: d3171a9d75eac20b68cee6729dddc28cd7e6c612
git at public.curoverse.com
git at public.curoverse.com
Thu Nov 12 16:34:45 EST 2015
Summary of changes:
doc/install/install-api-server.html.textile.liquid | 13 +++++++++----
doc/install/install-arv-git-httpd.html.textile.liquid | 3 +++
doc/install/install-workbench-app.html.textile.liquid | 6 ++++++
3 files changed, 18 insertions(+), 4 deletions(-)
via d3171a9d75eac20b68cee6729dddc28cd7e6c612 (commit)
via dc061e4b3c5be2d8687316c6d192fd053b4041e0 (commit)
via 0f0a0cd26446403fb987121af58bec550f3cf681 (commit)
from 8d9db88641ada8ecd5400fe4affd9b90647c5d3a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit d3171a9d75eac20b68cee6729dddc28cd7e6c612
Merge: 8d9db88 dc061e4
Author: Brett Smith <brett at curoverse.com>
Date: Thu Nov 12 16:33:48 2015 -0500
Merge branch '7645-doc-client-max-body-size-wip'
Closes #7645, #7742. Refs #7356.
commit dc061e4b3c5be2d8687316c6d192fd053b4041e0
Author: Brett Smith <brett at curoverse.com>
Date: Mon Nov 9 12:44:38 2015 -0500
7356: Install guide sets client_max_body_size for arv-git-httpd.
diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index 1c31dc4..7eec2d6 100644
--- a/doc/install/install-arv-git-httpd.html.textile.liquid
+++ b/doc/install/install-arv-git-httpd.html.textile.liquid
@@ -338,6 +338,9 @@ server {
ssl_certificate <span class="userinput">/YOUR/PATH/TO/cert.pem</span>;
ssl_certificate_key <span class="userinput">/YOUR/PATH/TO/cert.key</span>;
+ # The server needs to accept potentially large refpacks from push clients.
+ client_max_body_size 50m;
+
location / {
proxy_pass http://arvados-git-httpd;
}
commit 0f0a0cd26446403fb987121af58bec550f3cf681
Author: Brett Smith <brett at curoverse.com>
Date: Mon Nov 9 12:43:58 2015 -0500
7645: Install guide suggests setting client_max_body_size consistently.
Without these changes, the upstream Passenger processes may reject
large request bodies.
diff --git a/doc/install/install-api-server.html.textile.liquid b/doc/install/install-api-server.html.textile.liquid
index 695584f..69ff768 100644
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@ -244,6 +244,14 @@ exec chpst -m 1073741824 -u webserver-user:webserver-group -e "$envdir" \
passenger_enabled on;
# If you're using RVM, uncomment the line below.
#passenger_ruby /usr/local/rvm/wrappers/default/ruby;
+
+ # This value effectively limits the size of API objects users can
+ # create, especially collections. If you change this, you should
+ # also ensure the following settings match it:
+ # * `client_max_body_size` in the server section below
+ # * `client_max_body_size` in the Workbench Nginx configuration (twice)
+ # * `max_request_size` in the API server's application.yml file
+ client_max_body_size 128m;
}
upstream api {
@@ -277,10 +285,7 @@ server {
index index.html index.htm index.php;
- # This value effectively limits the size of API objects users can create,
- # especially collections. If you change this, you should also set
- # `max_request_size` in the API server's application.yml file to the same
- # value.
+ # Refer to the comment about this setting in the server section above.
client_max_body_size 128m;
location / {
diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index 22fc155..d05d94d 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -115,6 +115,10 @@ For best performance, we recommend you use Nginx as your Web server front-end, w
passenger_enabled on;
# If you're using RVM, uncomment the line below.
#passenger_ruby /usr/local/rvm/wrappers/default/ruby;
+
+ # `client_max_body_size` should match the corresponding setting in
+ # the API server's Nginx configuration.
+ client_max_body_size 128m;
}
upstream workbench {
@@ -132,6 +136,8 @@ server {
ssl_certificate_key <span class="userinput">/YOUR/PATH/TO/cert.key</span>;
index index.html index.htm index.php;
+ # `client_max_body_size` should match the corresponding setting in
+ # the API server's Nginx configuration.
client_max_body_size 128m;
location / {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list