X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/86ea398742e99ab5942705b342b0f0ac7bdef41d..ba5e37ebc18049d4340388fc0c19dcb2a78d6a86:/arvados/workbench/package/install.sls

diff --git a/arvados/workbench/package/install.sls b/arvados/workbench/package/install.sls
index 7487a60..cbda268 100644
--- a/arvados/workbench/package/install.sls
+++ b/arvados/workbench/package/install.sls
@@ -4,16 +4,17 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
+{%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %}
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
 
-# The workbench server requires a valid config BEFORE installing...
+{%- if arvados.ruby.manage_ruby %}
+  {%- set ruby_dep = 'rvm' if arvados.ruby.use_rvm else 'pkg' %}
+{%- endif %}
+
 include:
+  # The workbench server requires a valid config BEFORE installing...
   - {{ sls_config_file }}
-
-arvados-workbench-package-install-ruby-pkg-installed:
-  pkg.installed:
-    - name: {{ arvados.ruby.pkg }}
-    - only_if: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
+  - {{ sls_ruby_install }}
 
 arvados-workbench-package-install-gems-deps-pkg-installed:
   pkg.installed: