diff --git a/meta/main.yml b/meta/main.yml index 0b16d720..a30921b1 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -7,7 +7,7 @@ galaxy_info: description: Java for Linux company: "Midwestern Mac, LLC" license: "license (BSD, MIT)" - min_ansible_version: 2.10 + min_ansible_version: "2.10" platforms: - name: Fedora versions: @@ -30,7 +30,7 @@ galaxy_info: - jammy - name: FreeBSD versions: - - 10.2 + - "10.2" galaxy_tags: - development - system diff --git a/tasks/main.yml b/tasks/main.yml index 965bd9d2..134cd174 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,14 +1,14 @@ --- - name: Include OS-specific variables for Fedora or FreeBSD. - include_vars: "{{ ansible_distribution }}.yml" + ansible.builtin.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" + ansible.builtin.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" + ansible.builtin.include_vars: "RedHat-{{ ansible_distribution_version.split('.')[0] }}.yml" when: >- ansible_distribution in [ 'CentOS', @@ -20,34 +20,38 @@ ] - name: Include version-specific variables for Ubuntu. - include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml" + ansible.builtin.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" + ansible.builtin.include_vars: "{{ ansible_distribution | title }}-{{ ansible_distribution_version.split('.')[0] }}.yml" when: ansible_os_family == 'Debian' - name: Define java_packages. - set_fact: + ansible.builtin.set_fact: java_packages: "{{ __java_packages | list }}" when: java_packages is not defined # Setup/install tasks. -- include_tasks: setup-RedHat.yml +- name: Include task setup-RedHat.yml + ansible.builtin.include_tasks: setup-RedHat.yml when: ansible_os_family == 'RedHat' and ansible_distribution_file_variety == 'RedHat' -- include_tasks: setup-Amazon.yml +- name: Include task setup-Amazon.yml + ansible.builtin.include_tasks: setup-Amazon.yml when: ansible_distribution == 'Amazon' -- include_tasks: setup-Debian.yml +- name: Include task setup-Debian.yml + ansible.builtin.include_tasks: setup-Debian.yml when: ansible_os_family == 'Debian' -- include_tasks: setup-FreeBSD.yml +- name: Include task setup-FreeBSD.yml + ansible.builtin.include_tasks: setup-FreeBSD.yml when: ansible_os_family == 'FreeBSD' # Environment setup. - name: Set JAVA_HOME if configured. - template: + ansible.builtin.template: src: java_home.sh.j2 dest: /etc/profile.d/java_home.sh mode: 0644 diff --git a/tasks/setup-Amazon.yml b/tasks/setup-Amazon.yml index 13069452..9d4f515d 100644 --- a/tasks/setup-Amazon.yml +++ b/tasks/setup-Amazon.yml @@ -1,5 +1,5 @@ --- - name: Ensure Java is installed. - package: + ansible.builtin.package: name: "{{ java_packages }}" state: present diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index c0cb667a..e76379b0 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -2,7 +2,7 @@ # 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: # noqa 208 + ansible.builtin.file: path: /usr/share/man/man1 state: directory mode: 0755 @@ -11,6 +11,6 @@ - ansible_distribution_major_version | int >= 18 - name: Ensure Java is installed. - apt: + ansible.builtin.apt: name: "{{ java_packages }}" state: present diff --git a/tasks/setup-FreeBSD.yml b/tasks/setup-FreeBSD.yml index c3eeebb8..b05ae88b 100644 --- a/tasks/setup-FreeBSD.yml +++ b/tasks/setup-FreeBSD.yml @@ -1,11 +1,11 @@ --- - name: Ensure Java is installed. - pkgng: + community.general.pkgng: name: "{{ java_packages }}" state: present - name: Ensure proc is mounted - mount: + ansible.posix.mount: name: /proc fstype: procfs src: proc @@ -13,7 +13,7 @@ state: mounted - name: Ensure fdesc is mounted - mount: + ansible.posix.mount: name: /dev/fd fstype: fdescfs src: fdesc diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 13069452..9d4f515d 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -1,5 +1,5 @@ --- - name: Ensure Java is installed. - package: + ansible.builtin.package: name: "{{ java_packages }}" state: present