Update role dependencies

roles/geerlingguy.java/tasks/main.yml

@@ -3,18 +3,28 @@
   include_vars: "{{ ansible_distribution }}.yml"
   when: ansible_distribution == 'FreeBSD' or ansible_distribution == 'Fedora'
 
+- name: Include OS-specific variables for Amazon.
+  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml"
+  when: ansible_distribution == 'Amazon'
+
 - name: Include version-specific variables for CentOS/RHEL.
   include_vars: "RedHat-{{ ansible_distribution_version.split('.')[0] }}.yml"
-  when: ansible_distribution == 'CentOS' or
-        ansible_distribution == 'Red Hat Enterprise Linux' or
-        ansible_distribution == 'RedHat'
+  when: >-
+    ansible_distribution in [
+      'CentOS',
+      'Red Hat Enterprise Linux',
+      'RedHat',
+      'OracleLinux',
+      'Rocky',
+      'AlmaLinux'
+    ]
 
 - name: Include version-specific variables for Ubuntu.
   include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
   when: ansible_distribution == 'Ubuntu'
 
 - name: Include version-specific variables for Debian.
-  include_vars: "{{ ansible_distribution|title }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
+  include_vars: "{{ ansible_distribution | title }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
   when: ansible_os_family == 'Debian'
 
 - name: Define java_packages.
@@ -24,7 +34,10 @@
 
 # Setup/install tasks.
 - include_tasks: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family == 'RedHat' and ansible_distribution_file_variety == 'RedHat'
+
+- include_tasks: setup-Amazon.yml
+  when: ansible_distribution == 'Amazon'
 
 - include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'

roles/geerlingguy.java/tasks/setup-Debian.yml

@@ -2,10 +2,10 @@
 # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199 and
 # https://github.com/geerlingguy/ansible-role-java/issues/64
 - name: Ensure 'man' directory exists.
-  file:
+  file:  # noqa 208
     path: /usr/share/man/man1
     state: directory
-    recurse: true
+    mode: 0755
   when:
     - ansible_distribution == 'Ubuntu'
     - ansible_distribution_major_version | int >= 18

roles/geerlingguy.java/tasks/setup-FreeBSD.yml

@@ -4,8 +4,18 @@
     name: "{{ java_packages }}"
     state: present
 
-- name: ensure proc is mounted
-  mount: name=/proc fstype=procfs src=proc opts=rw state=mounted
+- name: Ensure proc is mounted
+  mount:
+    name: /proc
+    fstype: procfs
+    src: proc
+    opts: rw
+    state: mounted
 
-- name: ensure fdesc is mounted
-  mount: name=/dev/fd fstype=fdescfs src=fdesc opts=rw state=mounted
+- name: Ensure fdesc is mounted
+  mount:
+    name: /dev/fd
+    fstype: fdescfs
+    src: fdesc
+    opts: rw
+    state: mounted