X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/86ea398742e99ab5942705b342b0f0ac7bdef41d..ba5e37ebc18049d4340388fc0c19dcb2a78d6a86:/arvados/ruby/package/install.sls diff --git a/arvados/ruby/package/install.sls b/arvados/ruby/package/install.sls index 2200176..c76c043 100644 --- a/arvados/ruby/package/install.sls +++ b/arvados/ruby/package/install.sls @@ -6,8 +6,42 @@ {%- from tplroot ~ "/map.jinja" import arvados with context %} {%- if arvados.ruby.manage_ruby %} + + {%- if arvados.ruby.use_rvm %} + # Centos 7 has no python3-gnupg package, so using gpg.present + # will fail when it can't list the existing keys. + # Doing it the hard way +arvados-ruby-package-install-gpg-cmd-run-gpg-michal-papis: + cmd.run: + - name: /bin/gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + - unless: + - /bin/gpg --list-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + +arvados-ruby-package-install-gpg-cmd-run-gpg-piotr-kuczynski: + cmd.run: + - name: /bin/gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB + - unless: + - /bin/gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB + +arvados-ruby-package-install-rvm-cmd-run-curl: + cmd.run: + - name: curl -s -L http://get.rvm.io | bash -s stable + - unless: test -f /usr/local/rvm/bin/rvm + - require: + - cmd: arvados-ruby-package-install-gpg-cmd-run-gpg-michal-papis + - cmd: arvados-ruby-package-install-gpg-cmd-run-gpg-piotr-kuczynski + +arvados-ruby-package-install-ruby-rvm-installed: + rvm.installed: + - name: {{ arvados.ruby.pkg }} + - default: true + - require: + - cmd: arvados-ruby-package-install-rvm-cmd-run-curl + + {%- else %} + arvados-ruby-package-install-ruby-pkg-installed: pkg.installed: - name: {{ arvados.ruby.pkg }} - - require_in: arvados-ruby-package-install-ruby-profile-installed + {%- endif %} {%- endif %}