Merge branch '18631-shell-login-sync'

[arvados-formula.git] / arvados / osfamilymap.yaml

diff --git a/arvados/osfamilymap.yaml b/arvados/osfamilymap.yaml
index d6e9df1e88529c84523f27cc48c08c417f9bd026..7df0f006a55d351d9c392e0233cd2c5d562c0c06 100644 (file)
--- a/arvados/osfamilymap.yaml
+++ b/arvados/osfamilymap.yaml
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 #
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 # Setup variables using grains['os_family'] based logic.
 # You just need to add the key:values for an `os_family` that differ
 # from `defaults.yaml` + `osarch.yaml`.
@@ -14,7 +18,9 @@ Debian:
   repo:
     url_base: 'http://apt.arvados.org'
     file: /etc/apt/sources.list.d/arvados.list
-    key_url: 'http://apt.arvados.org/pubkey.gpg'
+    keyring_file: /usr/share/keyrings/arvados-archive-keyring.gpg
+    keyring_source: 'http://apt.arvados.org/keyring.gpg'
+    keyring_source_hash: 53c2c84849ada21e383f55af0753adb321cc941e7efab94483e3a1703fcc66f1
 
 RedHat:
   repo:
@@ -26,21 +32,19 @@ RedHat:
     manage_ruby: true
     use_rvm: true
 
-    pkg: ruby-2.5.7
+    pkg: ruby-2.7.2
     gems_deps:
-      - rubygem-bundler
       - curl
       - gcc
       - git
       - libcurl
       - libcurl-devel
       - pam-devel
-      - postgresql-devel
+      - centos-release-scl
       - libxml2
       - libxml2-devel
       - make
       - python3-devel
-      - ruby-devel
       - zlib-devel
   ##### SHELL
   shell: