Merge branch '20846-ruby3-compat'

[arvados.git] / doc / install / install-composer.html.textile.liquid

diff --git a/doc/install/install-composer.html.textile.liquid b/doc/install/install-composer.html.textile.liquid
index d27db4d4e533610697a44093b7a4d0491c6915ff..58ba5d03a0afa36735c4b4cf0f8c1e9c32d0e64c 100644 (file)
--- a/doc/install/install-composer.html.textile.liquid
+++ b/doc/install/install-composer.html.textile.liquid
@@ -36,44 +36,29 @@ h2(#update-nginx). Update nginx configuration
 
 Composer may be served from the same host as Workbench.  Composer communicates directly with the Arvados API server.  It does not require its own backend and should be served as a static file.
 
-Use a text editor to create a new file @/etc/nginx/conf.d/arvados-composer.conf@ with the following configuration.  Options that need attention are marked with "TODO".
+Add the following @location@ sections to @/etc/nginx/conf.d/arvados-workbench.conf@ .
 
 <notextile>
-<pre><code>location /composer {
-  root   /var/www/arvados-composer
-  index  index.html
-}
-
-location /composer.yml {
-  return 200 '{ "API_HOST": "<span class="userinput">ClusterID.example.com</span>" }';
-}
-</code></pre>
-</notextile>
-
-h2(#install-packages). Install arvados-composer
-
-h3. Centos 7
-
-<notextile>
-<pre><code># <span class="userinput">yum install arvados-composer</span>
-</code></pre>
-</notextile>
+<pre><code>server {
+  [...]
 
-h3. Debian and Ubuntu
+  location /composer {
+    root   /var/www/arvados-composer;
+    index  index.html;
+  }
 
-<notextile>
-<pre><code># <span class="userinput">apt-get --no-install-recommends install arvados-composer</span>
+  location /composer/composer.yml {
+    return 200 '{ "API_HOST": "<span class="userinput">ClusterID.example.com</span>" }';
+  }
+}
 </code></pre>
 </notextile>
 
-h2(#restart-api). Restart the API server and controller
+{% assign arvados_component = 'arvados-composer' %}
 
-After adding Workbench to the Services section, make sure the cluster config file is up to date on the API server host, and restart the API server and controller processes to ensure the changes are applied.
+{% include 'install_packages' %}
 
-<notextile>
-<pre><code># <span class="userinput">systemctl restart nginx arvados-controller</span>
-</code></pre>
-</notextile>
+{% include 'restart_api' %}
 
 h2(#confirm-working). Confirm working installation