Skip to content

Commit

Permalink
irods roles: conform to linter
Browse files Browse the repository at this point in the history
  • Loading branch information
dometto committed Apr 23, 2024
1 parent 94be0f1 commit e8d1553
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 22 deletions.
3 changes: 1 addition & 2 deletions playbooks/roles/irods_icommands/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---

- name: install icommands
- name: Install icommands
package:
name: irods-icommands
state: present

2 changes: 1 addition & 1 deletion playbooks/roles/irods_repo/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
irods_repo_yum_major_version: "{{ ansible_distribution_major_version }}"
irods_repo_apt_release: "{{ ansible_distribution_release }}"
irods_repo_url: "https://packages.irods.org"
irods_key_location: "/usr/share/keyrings/irods.asc"
irods_key_location: "/usr/share/keyrings/irods.asc"
7 changes: 3 additions & 4 deletions playbooks/roles/irods_repo/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
# adds iRODS repository, method depends on distro

- name: enable iRODS repository, yum package manager
- name: Enable iRODS repository, yum package manager
yum_repository:
name: iRODS
description: RENCI iRODS Repository
baseurl: '{{ irods_repo_url }}/yum/pool/centos{{ irods_repo_yum_major_version }}/{{ ansible_architecture }}'
gpgkey: '{{ irods_repo_url }}/irods-signing-key.asc'
gpgcheck: yes
gpgcheck: true
when: ansible_pkg_mgr == 'yum'

- name: Download irods key
Expand All @@ -21,6 +21,5 @@
repo: "deb [signed-by={{ irods_key_location }}] {{ irods_repo_url }}/apt/ {{ ansible_distribution_release }} main"
state: present
filename: renci-irods
update_cache: yes
update_cache: true
when: ansible_pkg_mgr == 'apt'

28 changes: 13 additions & 15 deletions playbooks/roles/irods_skel/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
---
- name: Add .irods to new user skeleton
file:
path: /etc/skel/.irods
state: directory
mode: '0755'

- name: Create default irods_environment.json in skel
template:
src: irods_environment.json.j2
dest: /etc/skel/.irods/irods_environment.json
owner: root
group: root
mode: '0600'
force: no # don't overwrite if an environment file already exists (due to e.g. another component)

- name: Add .irods to new user skeleton
file:
path: /etc/skel/.irods
state: directory
mode: '0755'

- name: Create default irods_environment.json in skel
template:
src: irods_environment.json.j2
dest: /etc/skel/.irods/irods_environment.json
owner: root
group: root
mode: '0600'
force: false # don't overwrite if an environment file already exists (due to e.g. another component)

0 comments on commit e8d1553

Please sign in to comment.