Dried up the tags for evobackup-client

blocks allow us to assign multiple tags to multiple tasks without
repeating ourselves. This also simplifies other logic like conditional
includes.

evobackup-client/tasks/jail.yml

@@ -1,6 +1,7 @@
 ---
 
-- name: 'create jail'
+- block:
+  - name: 'create jail'
     command: "bkctld init {{ evolinux_hostname }}"
     args:
       creates: "/backup/jails/{{ evolinux_hostname }}/"
@@ -8,34 +9,26 @@
     delegate_to: "{{ evobackup_client__hosts[0].ip }}"
     notify:
       - 'created new jail'
-  tags:
-    - evobackup_client
-    - evobackup_client_jail
 
-# temp fix for bkctld 2.x because the ip and key command return 1
+  # temp fix for bkctld 2.x because the ip and key command return 1
-# if the jail is not started, see https://gitea.evolix.org/evolix/evobackup/issues/31
+  # if the jail is not started, see https://gitea.evolix.org/evolix/evobackup/issues/31
-- name: 'start jail'
+  - name: 'start jail'
     command: "bkctld restart {{ evolinux_hostname }}"
     become: true
     delegate_to: "{{ evobackup_client__hosts[0].ip }}"
-  tags:
-    - evobackup_client
-    - evobackup_client_jail
 
-- name: 'add ip to jail'
+  - name: 'add ip to jail'
     command: "bkctld ip {{ evolinux_hostname }} {{ ansible_host }}"
     become: true
     delegate_to: "{{ evobackup_client__hosts[0].ip }}"
     notify:  'jail updated'
-  tags:
-    - evobackup_client
-    - evobackup_client_jail
 
-- name: 'add key to jail'
+  - name: 'add key to jail'
     command: "bkctld key {{ evolinux_hostname }} /root/{{ evolinux_hostname }}.pub"
     become: true
     delegate_to: "{{ evobackup_client__hosts[0].ip }}"
     notify:  'jail updated'
+
   tags:
     - evobackup_client
     - evobackup_client_jail

evobackup-client/tasks/jail_port.yml

@@ -1,11 +1,17 @@
 ---
 
-- name: 'get jail port'
+- block:
+  - name: 'get jail port'
     command: "bkctld port {{ evolinux_hostname }}"
     become: true
     register: bkctld_port
     delegate_to: "{{ evobackup_client__hosts[0].ip }}"
 
-- name: 'register jail port'
+  - name: 'register jail port'
     set_fact:
       evobackup_ssh_port={{ bkctld_port.stdout }}
+
+  when: evobackup_ssh_port = ''
+  tags:
+    - evobackup_client
+    - evobackup_client_ssh_port

evobackup-client/tasks/main.yml

@@ -1,26 +1,11 @@
 ---
 
-- include: "ssh_key.yml"
+- block:
-  tags:
+  - include: "ssh_key.yml"
-    - evobackup_client
+  - include: "jail.yml"
-    - evobackup_client_backup_ssh_key
+  - include: "upload_scripts.yml"
+  - include: "open_ssh_ports.yml"
+  - include: "verify_ssh.yml"
 
-- include: "jail.yml"
   tags:
     - evobackup_client
-    - evobackup_client_jail
-
-- include: "upload_scripts.yml"
-  tags:
-    - evobackup_client
-    - evobackup_client_backup_scripts
-
-- include: "open_ssh_ports.yml"
-  tags:
-    - evobackup_client
-    - evobackup_client_backup_firewall
-
-- include: "verify_ssh.yml"
-  tags:
-    - evobackup_client
-    - evobackup_client_backup_hosts

evobackup-client/tasks/open_ssh_ports.yml

@@ -1,17 +1,15 @@
 ---
 
-- name: Is there a Minifirewall ?
+- block:
+  - name: Is there a Minifirewall ?
     stat:
       path: /etc/default/minifirewall
     register: evobackup_client__minifirewall
-  tags:
-    - evobackup_client
-    - evobackup_client_backup_firewall
 
-- include: "jail_port.yml"
+  - include: "jail_port.yml"
-  when: evobackup_ssh_port = ''
+    when: evobackup_client__minifirewall.stat.exists
 
-- name: Add backup SSH port in /etc/default/minifirewall
+  - name: Add backup SSH port in /etc/default/minifirewall
     blockinfile:
       dest: /etc/default/minifirewall
       marker: "# {mark} {{ item.name }}"
@@ -20,6 +18,7 @@
     with_items: "{{ evobackup_client__hosts }}"
     notify: restart minifirewall
     when: evobackup_client__minifirewall.stat.exists
+
   tags:
     - evobackup_client
-    - evobackup_client_backup_firewall
+    - evobackup_client_firewall

evobackup-client/tasks/ssh_key.yml

@@ -1,31 +1,28 @@
 ---
 
-- name: Create SSH key
+- block:
+  - name: Create SSH key
     user:
       name: root
       generate_ssh_key: true
       ssh_key_file: "{{ evobackup_client__root_key_path }}"
       ssh_key_type: "{{ evobackup_client__root_key_type }}"
     register: evobackup_client__root_key
-  tags:
-    - evobackup_client
-    - evobackup_client_backup_ssh_key
 
-- name: Print SSH key
+  - name: Print SSH key
     debug:
       var: evobackup_client__root_key.ssh_public_key
     when: evobackup_client__root_key.ssh_public_key is defined
-  tags:
-    - evobackup_client
-    - evobackup_client_backup_ssh_key
 
-- name: 'copy ssh public key to backup server'
+  - name: 'copy ssh public key to backup server'
     copy:
       content: "{{ evobackup_client__root_key.ssh_public_key }}"
       dest: "/root/{{ evolinux_hostname }}.pub"
     become: true
     delegate_to: "{{ evobackup_client__hosts[0].ip }}"
     tags:
-    - evobackup_client
-    - evobackup_client_backup_ssh_key
       - evobackup_client_jail
+
+  tags:
+    - evobackup_client
+    - evobackup_client_ssh_key

evobackup-client/tasks/upload_scripts.yml

@@ -1,9 +1,9 @@
 ---
 
-- include: "jail_port.yml"
+- block:
-  when: evobackup_ssh_port = ''
+  - include: "jail_port.yml"
 
-- name: Upload evobackup script
+  - name: Upload evobackup script
     template:
       src: "{{ item }}"
       dest: "{{ evobackup_client__cron_path }}"
@@ -14,3 +14,7 @@
       - "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.{{ host_group }}.sh.j2"
       - "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.sh.j2"
       - "zzz_evobackup.default.sh.j2"
+
+  tags:
+    - evobackup_client
+    - evobackup_client_script

evobackup-client/tasks/verify_ssh.yml

@@ -1,14 +1,15 @@
 ---
 
-- include: "jail_port.yml"
+- block:
-  when: evobackup_ssh_port = ''
+  - include: "jail_port.yml"
 
-- name: Verify evolix backup servers
+  - name: Verify evolix backup servers
     known_hosts:
       path: /root/.ssh/known_hosts
       name: "[{{ item.name }}]:{{ item.port }}"
       key: "[{{ item.name }}]:{{ item.port }} {{ item.fingerprint }}"
     with_list: "{{ evobackup_client__hosts }}"
+
   tags:
     - evobackup_client
-    - evobackup_client_backup_hosts
+    - evobackup_client_fingerprints