X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/250bd933ee9caf3a29f0e6dc3bab130a670d99e5..6618093e2e67d75fa83b173d3d3817545c8e6a3f:/arvados/ruby/package/install.sls?ds=sidebyside

diff --git a/arvados/ruby/package/install.sls b/arvados/ruby/package/install.sls
index c76c043..2782282 100644
--- a/arvados/ruby/package/install.sls
+++ b/arvados/ruby/package/install.sls
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
@@ -8,20 +12,35 @@
 {%- if arvados.ruby.manage_ruby %}
 
   {%- if arvados.ruby.use_rvm %}
+
+    # Centos 7 has a too old postgresql package and we need a newer one
+    {%- if grains.os_family in ('RedHat',) %}
+arvados-ruby-package-install-ruby-rvm-deps-centos-scl-release-pkg-installed:
+  pkg.installed:
+    - name: centos-release-scl
+
+arvados-ruby-package-install-ruby-rvm-deps-rh-postgres-libs-pkg-installed:
+  pkg.installed:
+    - name: rh-postgresql{{ arvados.api.postgresql_version }}-postgresql-libs
+    - unless: rpm -q postgresql{{ arvados.api.postgresql_version }}-libs
+    - require_in:
+      - cmd: arvados-ruby-package-install-rvm-cmd-run-curl
+    {%- endif %}
+
   # 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
+    - name: gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
     - unless:
-      - /bin/gpg --list-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+      - 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
+    - name: gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
     - unless:
-      - /bin/gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+      - gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 
 arvados-ruby-package-install-rvm-cmd-run-curl:
   cmd.run:
@@ -43,5 +62,6 @@ arvados-ruby-package-install-ruby-rvm-installed:
 arvados-ruby-package-install-ruby-pkg-installed:
   pkg.installed:
     - name: {{ arvados.ruby.pkg }}
+
   {%- endif %}
 {%- endif %}