X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/38d7f5515aab4069511f5658326276704c912d12..ab04a4c396f9fc33739564c6216d9b43fe19c4f2:/arvados/ruby/package/install.sls

diff --git a/arvados/ruby/package/install.sls b/arvados/ruby/package/install.sls
index 2782282..2ec0c09 100644
--- a/arvados/ruby/package/install.sls
+++ b/arvados/ruby/package/install.sls
@@ -8,6 +8,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
+{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 {%- if arvados.ruby.manage_ruby %}
 
@@ -30,15 +31,43 @@ arvados-ruby-package-install-ruby-rvm-deps-rh-postgres-libs-pkg-installed:
   # 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:
+arvados-ruby-package-install-file-managed-gpg-michal-papis:
+  file.managed:
+    - name: /tmp/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key
+    - source: {{ files_switch(['gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key'],
+                              lookup='arvados-ruby-package-install-file-managed-gpg-michal-papis',
+                              use_subpath=True
+                 )
+              }}
+    - mode: '0644'
+    - user: root
+    - group: root
+    - unless:
+      - gpg --list-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+
+arvados-ruby-package-install-cmd-run-gpg-michal-papis:
   cmd.run:
-    - name: gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+    - name: gpg --import /tmp/gpg-michal-papis-409B6B1796C275462A1703113804BB82D39DC0E3.key
     - unless:
       - gpg --list-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 
-arvados-ruby-package-install-gpg-cmd-run-gpg-piotr-kuczynski:
+arvados-ruby-package-install-file-managed-gpg-piotr-kuczynski:
+  file.managed:
+    - name: /tmp/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key
+    - source: {{ files_switch(['gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key'],
+                              lookup='arvados-ruby-package-install-file-managed-gpg-piotr-kuczynski',
+                              use_subpath=True
+                 )
+              }}
+    - mode: '0644'
+    - user: root
+    - group: root
+    - unless:
+      - gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+
+arvados-ruby-package-install-cmd-run-gpg-piotr-kuczynski:
   cmd.run:
-    - name: gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+    - name: gpg --import /tmp/gpg-piotr-kuczynski-7D2BAF1CF37B13E2069D6956105BD0E739499BDB.key
     - unless:
       - gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 
@@ -47,8 +76,8 @@ arvados-ruby-package-install-rvm-cmd-run-curl:
     - 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
+      - cmd: arvados-ruby-package-install-cmd-run-gpg-michal-papis
+      - cmd: arvados-ruby-package-install-cmd-run-gpg-piotr-kuczynski
 
 arvados-ruby-package-install-ruby-rvm-installed:
   rvm.installed: