aboutsummaryrefslogtreecommitdiffstats
path: root/tasks
diff options
context:
space:
mode:
authorColin Wilk <colin@wilk.cx>2026-06-26 22:11:18 +0200
committerColin Wilk <colin@wilk.cx>2026-06-26 22:11:18 +0200
commitbd022f046651d287309b26164cd60a3d6d38471c (patch)
tree557f3ecba27708dbaa9747d53bf571cd91041aac /tasks
parent2570550feba2abc80c182ca5e6918f29c22c4cf8 (diff)
downloadansible-role-borgbackup-bd022f046651d287309b26164cd60a3d6d38471c.tar.gz
ansible-role-borgbackup-bd022f046651d287309b26164cd60a3d6d38471c.zip
Update and fix pre-commit hooks
Diffstat (limited to 'tasks')
-rw-r--r--tasks/client_create_scripts_each.yml12
-rw-r--r--tasks/client_setup.yml40
-rw-r--r--tasks/installation.yml2
-rw-r--r--tasks/server_setup.yml10
4 files changed, 32 insertions, 32 deletions
diff --git a/tasks/client_create_scripts_each.yml b/tasks/client_create_scripts_each.yml
index f36ba7c..8e01174 100644
--- a/tasks/client_create_scripts_each.yml
+++ b/tasks/client_create_scripts_each.yml
@@ -1,27 +1,27 @@
---
- name: Create script for automatic borg backup
ansible.builtin.file:
- dest: '{{ script_location }}'
+ dest: "{{ script_location }}"
state: touch
owner: root
group: root
modification_time: preserve
access_time: preserve
- mode: '0711'
+ mode: "0711"
become: true
- name: Insert shebang into backup script
ansible.builtin.lineinfile:
- path: '{{ script_location }}'
- line: '#!/bin/bash'
+ path: "{{ script_location }}"
+ line: "#!/bin/bash"
insertbefore: BOF
state: present
become: true
- name: Insert Backup job block into scripts
ansible.builtin.blockinfile:
- path: '{{ script_location }}'
- marker: '## {mark} ANSIBLE MANAGED BLOCK for server: {{ borg_server_host_url }}'
+ path: "{{ script_location }}"
+ marker: "## {mark} ANSIBLE MANAGED BLOCK for server: {{ borg_server_host_url }}"
block: |
export BORG_PASSPHRASE={{ borg_passphrase | quote }}
borg create -C {{ borg_compression }} \
diff --git a/tasks/client_setup.yml b/tasks/client_setup.yml
index eb6c9a1..b3316c2 100644
--- a/tasks/client_setup.yml
+++ b/tasks/client_setup.yml
@@ -4,14 +4,14 @@
path: /root/.ssh
owner: root
group: root
- mode: '0640'
+ mode: "0640"
state: directory
become: true
- name: Add borg server to known_hosts
ansible.builtin.known_hosts:
- name: '{{ borg_server_host_url }}'
- key: '{{ borg_server_host_url }} {{ borg_server_host_ssh_key }}'
+ name: "{{ borg_server_host_url }}"
+ key: "{{ borg_server_host_url }} {{ borg_server_host_ssh_key }}"
path: /root/.ssh/known_hosts
state: present
become: true
@@ -21,30 +21,30 @@
path: /root/.ssh/id_rsa
owner: root
group: root
- mode: '0600'
+ mode: "0600"
comment: root@{{ inventory_hostname }}
become: true
register: ssh_key
- name: Deploy Keys to Borg server
ansible.builtin.lineinfile:
- path: '{{ borg_server_user_home }}/.ssh/authorized_keys'
+ path: "{{ borg_server_user_home }}/.ssh/authorized_keys"
line: >
restrict,command="borg serve
{{ "--append-only" if borg_mode_append_only }}
--restrict-to-repository {{ borg_repo_name }}"
{{ ssh_key.public_key }} root@{{ inventory_hostname }}
- search_string: '{{ ssh_key.public_key }}'
+ search_string: "{{ ssh_key.public_key }}"
state: present
become: true
- delegate_to: '{{ borg_server_host }}'
+ delegate_to: "{{ borg_server_host }}"
- name: Initialise Borg repository
ansible.builtin.command: >
borg init --encryption=repokey
borg@{{ borg_server_host_url }}:{{ borg_server_user_home }}/{{ borg_repo_name }}
environment:
- BORG_PASSPHRASE: '{{ borg_passphrase }}'
+ BORG_PASSPHRASE: "{{ borg_passphrase }}"
become: true
register: init_borg_output
changed_when: init_borg_output.rc != 2
@@ -54,9 +54,9 @@
- name: Make sure key file exists
ansible.builtin.file:
- path: '{{ borg_decryption_keys_yaml_path }}'
+ path: "{{ borg_decryption_keys_yaml_path }}"
state: touch
- mode: '0600'
+ mode: "0600"
access_time: preserve
modification_time: preserve
delegate_to: localhost
@@ -64,7 +64,7 @@
- name: Read Vars file
ansible.builtin.include_vars:
- file: '{{ borg_decryption_keys_yaml_path }}'
+ file: "{{ borg_decryption_keys_yaml_path }}"
register: local
- name: Add repository encryption keys to ansible repo
@@ -81,13 +81,13 @@
- name: If host new add encryption keys to vars
ansible.builtin.set_fact:
- decryption_keys: '{{ local.ansible_facts | combine({inventory_hostname: borg_keys.stdout}) }}'
+ decryption_keys: "{{ local.ansible_facts | combine({inventory_hostname: borg_keys.stdout}) }}"
- name: Update encryption vars
ansible.builtin.copy:
- content: '{{ decryption_keys | to_nice_yaml(indent=2, width=2048) }}'
- dest: '{{ borg_decryption_keys_yaml_path }}'
- mode: '0600'
+ content: "{{ decryption_keys | to_nice_yaml(indent=2, width=2048) }}"
+ dest: "{{ borg_decryption_keys_yaml_path }}"
+ mode: "0600"
when: decryption_keys is defined
delegate_to: localhost
become: false
@@ -95,8 +95,8 @@
- name: Create backup scripts
ansible.builtin.include_tasks: client_create_scripts_each.yml
loop:
- - '{{ borg_backup_script_location }}'
- - '{{ borg_backup_script_location }}{{ "@" if borg_backup_argument != "" }}{{ borg_backup_argument }}'
+ - "{{ borg_backup_script_location }}"
+ - "{{ borg_backup_script_location }}{{ '@' if borg_backup_argument != '' else '' }}{{ borg_backup_argument }}"
loop_control:
loop_var: script_location
@@ -104,7 +104,7 @@
ansible.builtin.template:
src: borg_backup.service.j2
dest: /etc/systemd/system/{{ borg_backup_timer_name }}{{ "@" if borg_backup_argument != "" }}{{ borg_backup_argument }}.service
- mode: '0644'
+ mode: "0644"
owner: root
group: root
notify: Reload systemd
@@ -114,7 +114,7 @@
ansible.builtin.template:
src: borg_backup.timer.j2
dest: /etc/systemd/system/{{ borg_backup_timer_name }}{{ "@" if borg_backup_argument != "" }}{{ borg_backup_argument }}.timer
- mode: '0644'
+ mode: "0644"
owner: root
group: root
notify: Reload systemd
@@ -125,7 +125,7 @@
- name: Enable borg_backup systemd timer
ansible.builtin.systemd:
- name: '{{ borg_backup_timer_name }}{{ "@" if borg_backup_argument != "" }}{{ borg_backup_argument }}.timer'
+ name: "{{ borg_backup_timer_name }}{{ '@' if borg_backup_argument != '' else '' }}{{ borg_backup_argument }}.timer"
state: started
enabled: true
become: true
diff --git a/tasks/installation.yml b/tasks/installation.yml
index 7e64ff3..5fc7ecb 100644
--- a/tasks/installation.yml
+++ b/tasks/installation.yml
@@ -7,7 +7,7 @@
update_cache: true
become: true
when: ansible_facts['os_family'] == "Debian"
- delegate_to: '{{ borg_server_host }}'
+ delegate_to: "{{ borg_server_host }}"
- name: Install Debian Client dependencies
ansible.builtin.apt:
diff --git a/tasks/server_setup.yml b/tasks/server_setup.yml
index b0a8251..603dd3d 100644
--- a/tasks/server_setup.yml
+++ b/tasks/server_setup.yml
@@ -4,19 +4,19 @@
name: borg
comment: Borgbackup user
create_home: true
- home: '{{ borg_server_user_home }}'
+ home: "{{ borg_server_user_home }}"
generate_ssh_key: true
become: true
- delegate_to: '{{ borg_server_host }}'
+ delegate_to: "{{ borg_server_host }}"
- name: Make sure authorized keys exists
ansible.builtin.file:
- path: '{{ borg_server_user_home }}/.ssh/authorized_keys'
+ path: "{{ borg_server_user_home }}/.ssh/authorized_keys"
state: touch
owner: borg
group: borg
- mode: '644'
+ mode: "644"
access_time: preserve
modification_time: preserve
become: true
- delegate_to: '{{ borg_server_host }}'
+ delegate_to: "{{ borg_server_host }}"