Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
AndriiKhomik committed Dec 9, 2024
1 parent 65ff8b4 commit 86f5932
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
8 changes: 7 additions & 1 deletion ansible1/roles/packages/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
cache_valid_time: 86400

- name: Install system dependencies
run: sudo apt-get install -y libvips42 libvips-dev imagemagick
apt:
name:
- libvips42
- libvips-dev
- imagemagick
state: present
update_cache: yes

- name: Define ruby_build_packages
set_fact:
Expand Down
6 changes: 3 additions & 3 deletions ansible1/roles/packages/tasks/rvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@

- name: Import GPG keys from keyservers
shell: 'gpg --batch --keyserver {{ item }} --recv-keys {{ rvm1_gpg_keys }}'
register: gpg_import
changed_when: False
check_mode: False
with_items: '{{ rvm1_gpg_key_servers }}'
register: gpg_import
when: not ansible_check_mode and rvm1_gpg_keys != '' and (gpg_import is not defined or gpg_import.rc != 0)
ignore_errors: True

- name: Was GPG import from keyservers succesfull?
set_fact: gpg_imported_from={{ item.item }}
when: "'rc' in item and item.rc == 0"
with_items: "{{ gpg_import.results }}"
with_items: "{{ gpg_import.results | default([]) }}"
when: item.rc is defined and item.rc == 0

- name: Import GPG keys from rvm.io, if keyservers failed
shell: 'curl -sSL https://rvm.io/{{ item }} | gpg --batch --import -'
Expand Down
1 change: 1 addition & 0 deletions ansible1/roles/packages/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ rvm1_rvm: "{{ rvm1_install_path }}/bin/rvm"
rvm1_temp_download_path: "/tmp"
rvm1_rvm_latest_installer: "https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer"
rvm1_gpg_keys: "409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
rvm1_gpg_key_server: "hkp://keys.openpgp.org"
rvm1_gpg_key_servers:
- "{{ rvm1_gpg_key_server }}"
- hkp://pgp.mit.edu
Expand Down

0 comments on commit 86f5932

Please sign in to comment.