geerlingguy · FreddyFunk · Jan 9, 2025 · Jan 9, 2025
diff --git a/.ansible-lint-ignore b/.ansible-lint-ignore
@@ -0,0 +1 @@
+meta/main.yml schema[meta]
diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml
@@ -0,0 +1,15 @@
+name: ansible-lint
+on:
+  pull_request:
+    branches: ["main", "master"]
+jobs:
+  build:
+    name: Ansible Lint
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run ansible-lint
+        uses: ansible/ansible-lint@main
+        with:
+          setup_python: "true"
+          requirements_file: "requirements.yml"
diff --git a/.yamllint b/.yamllint
diff --git a/README.md b/README.md
@@ -72,7 +72,10 @@ Increase the maximum root distance between the host & the ntp source.
 
 ## Dependencies
 
-None.
+Requires the Ansible Galaxy Collection `community.general` to be installed:
+```bash
+ansible-galaxy collection install community.general
+```
 
 ## Example Playbook
 

diff --git a/handlers/main.yml b/handlers/main.yml
@@ -1,12 +1,12 @@
 ---
-- name: restart ntp
-  service:
+- name: Restart ntp
+  ansible.builtin.service:
     name: "{{ ntp_daemon }}"
     state: restarted
   when: ntp_enabled | bool
 
-- name: restart cron
-  service:
+- name: Restart cron
+  ansible.builtin.service:
     name: "{{ ntp_cron_daemon }}"
     state: restarted
   when: ntp_cron_handler_enabled | bool
diff --git a/meta/main.yml b/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: NTP installation and configuration for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.10
+  min_ansible_version: "2.10"
   platforms:
     - name: Fedora
       versions:

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -9,7 +9,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt:
+      ansible.builtin.apt:
         update_cache: true
         cache_valid_time: 600
       when: ansible_os_family == 'Debian'

diff --git a/requirements.yml b/requirements.yml
@@ -0,0 +1,5 @@
+---
+collections:
+  - name: community.general
+    version: ">=10.2.0"
+    source: https://galaxy.ansible.com
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,52 +1,52 @@
 ---
 - name: Include OS-specific variables.
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_facts['distribution'] + '-' + ansible_facts['distribution_version'] }}.yml"
     - "{{ ansible_facts['os_family'] + '-' + ansible_facts['distribution_major_version'] }}.yml"
     - "{{ ansible_facts['os_family'] }}.yml"
 
 - name: Set the ntp_driftfile variable.
-  set_fact:
+  ansible.builtin.set_fact:
     ntp_driftfile: "{{ __ntp_driftfile }}"
   when: ntp_driftfile is not defined
 
 - name: Set the ntp_package variable.
-  set_fact:
+  ansible.builtin.set_fact:
     ntp_package: "{{ __ntp_package }}"
   when: ntp_package is not defined
 
 - name: Set the ntp_config_file variable.
-  set_fact:
+  ansible.builtin.set_fact:
     ntp_config_file: "{{ __ntp_config_file }}"
   when: ntp_config_file is not defined
 
 - name: Set the ntp_daemon variable.
-  set_fact:
+  ansible.builtin.set_fact:
     ntp_daemon: "{{ __ntp_daemon }}"
   when: ntp_daemon is not defined
 
 - name: Ensure NTP package is installed.
-  package:
+  ansible.builtin.package:
     name: "{{ ntp_package }}"
     state: present
 
 - name: Ensure tzdata package is installed (Linux).
-  package:
+  ansible.builtin.package:
     name: "{{ ntp_tzdata_package }}"
     state: present
   when: ansible_system == "Linux"
 
 - name: Set timezone.
-  timezone:
+  community.general.timezone:
     name: "{{ ntp_timezone }}"
   notify: restart cron
 
 - name: Populate service facts.
-  service_facts:
+  ansible.builtin.service_facts:
 
 - name: Disable systemd-timesyncd if it's running but ntp is enabled.
-  service:
+  ansible.builtin.service:
     name: systemd-timesyncd.service
     enabled: false
     state: stopped
@@ -56,23 +56,23 @@
     - services["systemd-timesyncd.service"]["status"] != "not-found"
 
 - name: Ensure NTP is running and enabled as configured.
-  service:
+  ansible.builtin.service:
     name: "{{ ntp_daemon }}"
     state: started
     enabled: true
   when: ntp_enabled | bool
   ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Ensure NTP is stopped and disabled as configured.
-  service:
+  ansible.builtin.service:
     name: "{{ ntp_daemon }}"
     state: stopped
     enabled: false
   when: not (ntp_enabled | bool)
   ignore_errors: "{{ ansible_check_mode }}"
 
 - name: Generate ntp configuration file.
-  template:
+  ansible.builtin.template:
     src: "{{ ntp_config_file | basename }}.j2"
     dest: "{{ ntp_config_file }}"
     mode: 0644