From 6d86c53e8a3e1bde9d81a9866d2c246a5dbc6452 Mon Sep 17 00:00:00 2001
From: Frank Dornheim <524257+conloos@users.noreply.github.com>
Date: Sat, 25 Feb 2023 20:17:21 +0100
Subject: [PATCH] add full path

---
 tasks/install_package.yml |  2 +-
 tasks/install_pip.yml     | 14 +++++++-------
 tasks/main.yml            | 22 +++++++++++-----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tasks/install_package.yml b/tasks/install_package.yml
index f153ecb..ec90e7c 100644
--- a/tasks/install_package.yml
+++ b/tasks/install_package.yml
@@ -12,7 +12,7 @@
       fail_msg: Need EPEL repo to install via distro package.
 
 - name: Install borgmatic and borg via distribution package manager
-  package:
+  ansible.builtin.package:
     name: "{{ item }}"
     state: present
   loop: "{{ borg_distro_packages }}"
diff --git a/tasks/install_pip.yml b/tasks/install_pip.yml
index 1f72f39..7a1eef9 100644
--- a/tasks/install_pip.yml
+++ b/tasks/install_pip.yml
@@ -1,26 +1,26 @@
 ---
 - name: Install build dependencies
-  package:
+  ansible.builtin.package:
     name: "{{ borg_pip_packages }}"
     state: present
 
 - name: Create virtualenv for borg  # noqa package-latest
-  pip:
+  ansible.builtin.pip:
     name:
-    - pip
-    - setuptools
+      - pip
+      - setuptools
     state: latest
     virtualenv: /opt/borgmatic
     virtualenv_command: "{{ python_bin }} -m venv"
 
 - name: Install dependent Python Packages
-  pip:
+  ansible.builtin.pip:
     name: "{{ borg_dependent_python_packages }}"
     virtualenv: /opt/borgmatic
   when: borg_dependent_python_packages is defined
 
 - name: Install main Python Packages
-  pip:
+  ansible.builtin.pip:
     name: "{{ item.name }}"
     version: "{{ item.version | default(omit, true) }}"
     virtualenv: /opt/borgmatic
@@ -28,7 +28,7 @@
   loop: "{{ borg_python_packages }}"
 
 - name: Create borgmatic command in /usr/local/bin
-  copy:
+  ansible.builtin.copy:
     content: |
       #!/bin/bash
       . /opt/borgmatic/bin/activate
diff --git a/tasks/main.yml b/tasks/main.yml
index 4b67356..55662ad 100755
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure legacy hooks aren't used
-  assert:
+  ansible.builtin.assert:
     that:
       - borgmatic_failure_command is undefined
       - borgmatic_before_backup_command is undefined
@@ -17,7 +17,7 @@
     - "{{ ansible_lsb.id }}.yml"
 
 - name: Install general dependencies (cron and openssh)
-  package:
+  ansible.builtin.package:
     name: "{{ borg_dep_packages }}"
     state: present
 
@@ -26,7 +26,7 @@
     file: install_{{ borg_install_method }}.yml
 
 - name: Ensure root has SSH key.
-  user:
+  ansible.builtin.user:
     name: "root"
     generate_ssh_key: yes
     ssh_key_file: "{{ ssh_key_file }}"
@@ -34,18 +34,18 @@
   register: root_user
 
 - name: Print key created for root user (use for remote repo)
-  debug:
+  ansible.builtin.debug:
     var: root_user['ssh_public_key']
 
 - name: Ensure /etc/borgmatic exists
-  file:
+  ansible.builtin.file:
     path: /etc/borgmatic
     state: directory
     mode: 0700
     owner: root
 
 - name: Add Borgmatic configuration
-  template:
+  ansible.builtin.template:
     src: config.yaml.j2
     dest: "/etc/borgmatic/{{ borgmatic_config_name }}"
     mode: 0600
@@ -53,7 +53,7 @@
 - name: Add cron-job for borgmatic (large repo, create and check separate)
   block:
     - name: Add cron job for regular create and prune
-      cron:
+      ansible.builtin.cron:
         name: "{{ borgmatic_cron_name }}"
         hour: "{{ borgmatic_cron_hour }}"
         minute: "{{ borgmatic_cron_minute }}"
@@ -61,7 +61,7 @@
         cron_file: "{{ borgmatic_cron_name }}"
         job: "borgmatic -c /etc/borgmatic/{{ borgmatic_config_name }} -C -p"
     - name: Add cron job for infrequent checks
-      cron:
+      ansible.builtin.cron:
         name: "{{ borgmatic_cron_name }}-check"
         day: "{{ borgmatic_cron_checks_day }}"
         hour: "{{ borgmatic_cron_checks_hour }}"
@@ -74,7 +74,7 @@
 - name: Add cron-job for borgmatic (normal-sized repo)
   block:
     - name: Add cron job for create, check and prune
-      cron:
+      ansible.builtin.cron:
         name: "{{ borgmatic_cron_name }}"
         hour: "{{ borgmatic_cron_hour }}"
         minute: "{{ borgmatic_cron_minute }}"
@@ -82,13 +82,13 @@
         cron_file: "{{ borgmatic_cron_name }}"
         job: "borgmatic -c /etc/borgmatic/{{ borgmatic_config_name }}"
     - name: Ensure separate check cron job is absent
-      cron:
+      ansible.builtin.cron:
         name: "{{ borgmatic_cron_name }}-check"
         state: absent
   when: not borgmatic_large_repo
 
 - name: Set PATH for borgmatic cron job.
-  cron:
+  ansible.builtin.cron:
     user: "root"
     cron_file: "{{ borgmatic_cron_name }}"
     name: PATH