X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ad17f016de2feecc24a163af77c9c9c5add7dc3b..da5858d5f794c14cf00b830166bb34b1bcd79ba5:/doc/admin/config-urls.html.textile.liquid diff --git a/doc/admin/config-urls.html.textile.liquid b/doc/admin/config-urls.html.textile.liquid index 6152b02513..e2d1404332 100644 --- a/doc/admin/config-urls.html.textile.liquid +++ b/doc/admin/config-urls.html.textile.liquid @@ -31,14 +31,12 @@ table(table table-bordered table-condensed). |controller |yes |yes|yes ^2,4^|InternalURLs used by reverse proxy and container shell connections| |arvados-dispatch-cloud|no |yes|no ^3^|InternalURLs only used to expose Prometheus metrics| |arvados-dispatch-lsf|no |yes|no ^3^|InternalURLs only used to expose Prometheus metrics| -|git-http |yes |yes|no ^2^|InternalURLs only used by reverse proxy (e.g. Nginx)| |git-ssh |yes |no |no || |keepproxy |yes |yes|no ^2^|InternalURLs only used by reverse proxy (e.g. Nginx)| |keepstore |no |yes|yes |All clients connect to InternalURLs| |keep-balance |no |yes|no ^3^|InternalURLs only used to expose Prometheus metrics| |keep-web |yes |yes|yes ^5^|InternalURLs used by reverse proxy and container log API| |websocket |yes |yes|no ^2^|InternalURLs only used by reverse proxy (e.g. Nginx)| -|workbench1 |yes |no|no || |workbench2 |yes |no|no || @@ -149,38 +147,6 @@ server { If a client connects to the @Keepproxy@ service, it will talk to Nginx which will reverse proxy the traffic to the @Keepproxy@ service. -h3. Workbench - -Consider this section for the @Workbench@ service: - -{% codeblock as yaml %} - Workbench1: - ExternalURL: "https://workbench.ClusterID.example.com" -{% endcodeblock %} - -The @ExternalURL@ advertised is @https://workbench.ClusterID.example.com@. There is no value for @InternalURLs@ because Workbench1 is a Rails application served by Passenger. The only client connecting to the Passenger process is the reverse proxy (e.g. Nginx), and the listening host/post is configured in its configuration: - -

-server {
-  listen       443 ssl;
-  server_name  workbench.ClusterID.example.com;
-
-  ssl_certificate     /YOUR/PATH/TO/cert.pem;
-  ssl_certificate_key /YOUR/PATH/TO/cert.key;
-
-  root /var/www/arvados-workbench/current/public;
-  index  index.html;
-
-  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.MaxRequestSize and Controller's server's Nginx configuration.
-  client_max_body_size 128m;
-}
-
- h3. API server Consider this section for the @RailsAPI@ service: @@ -207,10 +173,7 @@ server { index index.html index.htm index.php; passenger_enabled on; - - # If you are using RVM, uncomment the line below. - # If you're using system ruby, leave it commented out. - #passenger_ruby /usr/local/rvm/wrappers/default/ruby; + passenger_preload_bundler on; # This value effectively limits the size of API objects users can # create, especially collections. If you change this, you should