fix some ansible-lint errors

This commit is contained in:
Sergey Malyuk
2025-12-12 18:35:37 +03:00
parent c40b4928f7
commit 3f4556f3b2
7 changed files with 50 additions and 49 deletions

View File

@@ -2,12 +2,12 @@
- name: "Compose basic configuration for Borgmatic"
ansible.builtin.set_fact:
borgmatic_composite_config:
source_directories: "{{ borg_source_directories }}"
source_directories: "{{ borgmatic_source_directories }}"
repositories:
- path: "{{ borg_repo_path }}"
label: "{{ borg_repo_label }}"
encryption_passphrase: "{{ borg_encryption_passphrase }}"
compression: "{{ borg_compression }}"
- path: "{{ borgmatic_repo_path }}"
label: "{{ borgmatic_repo_label }}"
encryption_passphrase: "{{ borgmatic_encryption_passphrase }}"
compression: "{{ borgmatic_compression }}"
# CLI output configuration
list_details: true
statistics: true
@@ -17,18 +17,18 @@
syslog_verbosity: 1
monitoring_verbosity: 1
# backup depth
keep_hourly: "{{ borg_keep_hourly }}"
keep_daily: "{{ borg_keep_daily }}"
keep_weekly: "{{ borg_keep_weekly }}"
keep_monthly: "{{ borg_keep_monthly }}"
keep_yearly: "{{ borg_keep_yearly }}"
keep_hourly: "{{ borgmatic_keep_hourly }}"
keep_daily: "{{ borgmatic_keep_daily }}"
keep_weekly: "{{ borgmatic_keep_weekly }}"
keep_monthly: "{{ borgmatic_keep_monthly }}"
keep_yearly: "{{ borgmatic_keep_yearly }}"
- name: "Add Uptime Kuma configuration"
when: borg_uptime_kuma
when: borgmatic_uptime_kuma
ansible.builtin.set_fact:
borgmatic_composite_config: "{{ borgmatic_composite_config | combine({'uptime_kuma': borg_uptime_kuma}) }}"
borgmatic_composite_config: "{{ borgmatic_composite_config | combine({'uptime_kuma': borgmatic_uptime_kuma}) }}"
- name: "Add Loki configuration"
when: borg_loki
when: borgmatic_loki
ansible.builtin.set_fact:
borgmatic_composite_config: "{{ borgmatic_composite_config | combine({'loki': borg_loki}) }}"
borgmatic_composite_config: "{{ borgmatic_composite_config | combine({'loki': borgmatic_loki}) }}"

View File

@@ -8,7 +8,7 @@
mode: "0700"
- name: "Generate an ed25519 SSH key pair with 100 KDF rounds"
register: ssh_key_pair
register: borgmatic_ssh_key_pair
community.crypto.openssh_keypair:
type: ed25519
path: "{{ ssh_key_path }}"
@@ -21,5 +21,5 @@
delegate_to: "{{ repo_server_inventory_hostname }}"
ansible.posix.authorized_key:
user: "{{ repo_server_user }}"
key: "{{ ssh_key_pair.public_key }}"
key: "{{ borgmatic_ssh_key_pair.public_key }}"
state: present

View File

@@ -37,22 +37,22 @@
# we are looking for Borg installed in a directory that Max Hoesel's role exects to find it
- name: "Get the currently installed version of Borg"
changed_when: false
register: borg_version_installed
register: borgmatic_version_installed
ansible.builtin.command:
cmd: /usr/bin/borg --version
- name: "Check that the correct version of Borg is installed"
ansible.builtin.assert:
that: borg_version_installed.stdout.find(borg_version)
fail_msg: "The expected Borg version was not found: {{ borg_version_installed }}"
success_msg: "Found the expected Borg version ({{ borg_version }})"
that: borgmatic_version_installed.stdout.find(borgmatic_version)
fail_msg: "The expected Borg version was not found: {{ borgmatic_version_installed }}"
success_msg: "Found the expected Borg version ({{ borgmatic_version }})"
rescue:
- name: "Download Borg from a custom URL: '{{ borg_binary_url }}'"
- name: "Download Borg from a custom URL: '{{ borgmatic_binary_url }}'"
retries: 3
delay: 1
ansible.builtin.unarchive:
src: "{{ borg_binary_url }}"
src: "{{ borgmatic_binary_url }}"
dest: "/opt/"
remote_src: true
owner: root