From 4cfe740fc6ca980b14df6f6e8c1f722241a876de Mon Sep 17 00:00:00 2001
From: Matěj Grabovský <mgrabovs@redhat.com>
Date: Jun 08 2021 12:43:54 +0000
Subject: retrace: Improve code style


* Capitalise task names.
* Wrap shell commands in quotes.
* Use folded strings where appropriate.
* Wrap tasks with the same condition in a block.

---

diff --git a/inventory/group_vars/retrace b/inventory/group_vars/retrace
index 0801ea3..4672b4c 100644
--- a/inventory/group_vars/retrace
+++ b/inventory/group_vars/retrace
@@ -14,8 +14,9 @@ ansible_ifcfg_blocklist: true
 
 tcp_ports: [ 80, 443 ]
 
-custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 2049 -j ACCEPT',
-                '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 5432 -j ACCEPT' ]
+custom_rules:
+- '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 2049 -j ACCEPT'
+- '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 5432 -j ACCEPT'
 
 
 nrpe_procs_warn: 1800
diff --git a/inventory/group_vars/retrace_stg_aws b/inventory/group_vars/retrace_stg_aws
index 517c696..5e53a6c 100644
--- a/inventory/group_vars/retrace_stg_aws
+++ b/inventory/group_vars/retrace_stg_aws
@@ -9,7 +9,7 @@ devel: true
 
 vpn: true
 
-tcp_ports: [22, 80, 443 ]
+tcp_ports: [ 22, 80, 443 ]
 
 sudoers: "{{ private }}/files/sudo/arm-retrace-sudoers"
 root_auth_users: msuchy mfabik mgrabovs mzidek
diff --git a/roles/abrt/faf-post/tasks/cron.yml b/roles/abrt/faf-post/tasks/cron.yml
index 5bcb86b..2903c3e 100644
--- a/roles/abrt/faf-post/tasks/cron.yml
+++ b/roles/abrt/faf-post/tasks/cron.yml
@@ -1,24 +1,25 @@
 ---
+- name: Cron jobs for production machines
+  block:
+  - name: Backup database daily
+    cron:
+      name: "backup database"
+      user: faf
+      job: >
+        ( pg_dump --format=custom --file={{ faf_backup_dir }}/backup-$(date '+\%F').dump faf )
+          >> /var/log/faf/db_backup.log 2>&1
+      special_time: daily
+      state: present
 
-- name: backup database
-  cron:
-    name: "backup database"
-    user: faf
-    job: "( pg_dump -Fc faf > /srv/faf/db-backup/backup-$(date '+\\%F').dump ) >> /var/log/faf/db_backup.log 2>&1"
-    special_time: daily
-    state: present
-
-- name: delete old database backups
-  cron:
-    name: "delete database backups older than X days"
-    user: faf
-    job: "find /srv/faf/db-backup/ -mtime +14 -type f -delete"
-    special_time: daily
-    state: present
+  - name: Delete old database backups
+    cron:
+      name: "delete database backups older than {{ faf_old_backup_age }} days"
+      user: faf
+      job: "find {{ faf_backup_dir }} -mtime {{ faf_old_backup_age }} -type f -delete"
+      special_time: daily
+      state: present
 
-- name: Run crons when not devel
-  block:
-  - name: pull associates
+  - name: Pull associates
     cron:
       name: "cron for pull associates"
       user: faf
@@ -34,11 +35,13 @@
       special_time: daily
       state: present
 
-  - name: probable fixes
+  - name: Job for probable fixes in active Fedora releases
     cron:
       name: "cron for probable fixes for f{{ item }}"
       user: faf
-      job: "faf mark-probably-fixed -o fedora --opsys-release {{ item }} >> /var/log/faf/mark-probably-fixed-f{{ item }}.log 2>&1"
+      job: >
+        faf mark-probably-fixed -o fedora --opsys-release {{ item }}
+          >> /var/log/faf/mark-probably-fixed-f{{ item }}.log 2>&1
       special_time: daily
       state: present
     loop:
@@ -46,7 +49,7 @@
       - "32"
       - "33"
 
-  - name: remove obsolete probable fixes
+  - name: Remove job for probable fixes in removed Fedora releases
     cron:
       name: "cron for probable fixes for f{{ item }}"
       user: faf
@@ -62,7 +65,7 @@
       - "29"
       - "30"
 
-  - name: update BZ bugs fedora
+  - name: Update BZ bugs fedora
     cron:
       name: "cron for update BZ bugs fedora"
       user: faf
@@ -70,7 +73,7 @@
       special_time: daily
       state: present
 
-  - name: update BZ bugs centos
+  - name: Update BZ bugs centos
     cron:
       name: "cron for update BZ bugs centos"
       user: faf
@@ -78,7 +81,7 @@
       special_time: daily
       state: present
 
-  - name: attach BZ bugs centos
+  - name: Attach BZ bugs centos
     cron:
       name: "cron for attach BZ bugs centos"
       user: faf
@@ -86,7 +89,7 @@
       special_time: daily
       state: present
 
-  - name: archive reports and attachments
+  - name: Archive reports and attachments
     cron:
       name: "faf archive reports and attachments"
       user: faf
@@ -95,7 +98,7 @@
       state: present
   when: not devel|bool
 
-- name: install cron for deleting old archives
+- name: Cron job for deleting old archives
   cron:
     name: "rotate_faf_archives"
     special_time: "daily"
diff --git a/roles/abrt/faf-post/tasks/main.yml b/roles/abrt/faf-post/tasks/main.yml
index a8c897b..6fe73db 100644
--- a/roles/abrt/faf-post/tasks/main.yml
+++ b/roles/abrt/faf-post/tasks/main.yml
@@ -1,15 +1,16 @@
 ---
 # the magic with ! is that it return exit code 1 if 'already defined' is not present in output
-- name: add repositories
-  shell: ! faf repoadd --nogpgcheck "{{ item.name }}" dnf "{{ item.url | join('" "') }}" 2>&1 | grep 'already defined'
+- name: Add package repositories
+  shell: >
+    ! faf repoadd --nogpgcheck "{{ item.name }}" dnf "{{ item.url | join('" "') }}" 2>&1 | grep 'already defined'
   become: yes
   become_user: faf
   ignore_errors: yes
   tags: add_repo
   loop: "{{ faf_repos }}"
 
-- name: repoassign repositories
-  command: faf repoassign "{{ item.name }}" "{{ item.opsys }}" "{{ item.arch }}"
+- name: Assign repositories to releases
+  command: "faf repoassign '{{ item.name }}' '{{ item.opsys }}' '{{ item.arch }}'"
   become: yes
   become_user: faf
   tags: add_repo
@@ -18,7 +19,7 @@
 - import_tasks: cron.yml
   tags: cron
 
-- name: get repolist of EOL releases
+- name: List repositories of EOL releases
   shell: "faf repolist | grep fedora-{{ item }} || true"
   become: yes
   become_user: faf
@@ -26,15 +27,15 @@
   loop: "{{ rs_internal_fedora_vers_removed }}"
   changed_when: eol_repolist.stdout
 
-- name: remove repos of EOLed releases
-  command: faf repodel "{{ item }}"
+- name: Remove repositories of EOL releases
+  command: "faf repodel '{{ item }}'"
   become: yes
   become_user: faf
   ignore_errors: yes
   loop: "{{ eol_repolist.results | map(attribute='stdout_lines') | flatten }}"
 
-- name: cleanup packages from EOLed fedora release
-  command: "faf cleanup-packages Fedora '{{ item }}' "
+- name: Clean up packages from EOL Fedora releases
+  command: "faf cleanup-packages Fedora '{{ item }}'"
   become: yes
   become_user: faf
   loop: "{{ rs_internal_fedora_vers_removed }}"
diff --git a/roles/abrt/retrace-post/tasks/cron.yml b/roles/abrt/retrace-post/tasks/cron.yml
index b0b5f36..0613f9b 100644
--- a/roles/abrt/retrace-post/tasks/cron.yml
+++ b/roles/abrt/retrace-post/tasks/cron.yml
@@ -1,6 +1,5 @@
 ---
-
-- name: Create cron job for retrace-server
+- name: Create retrace-server reposync cron jobs for active Fedora versions
   cron:
     name: "rs reposync fedora {{ item[0] }} {{ item[1] }}"
     user: retrace
@@ -10,7 +9,7 @@
   loop: "{{ rs_internal_fedora_vers | product(rs_internal_arch_list) | list }}"
   when: not devel|bool
 
-- name: Remove obsolete cron job for retrace-server
+- name: Remove retrace-server reposync cron jobs of removed Fedora versions
   cron:
     name: "rs reposync fedora {{ item[0] }} {{ item[1] }}"
     user: retrace
@@ -20,7 +19,7 @@
   loop: "{{ rs_internal_fedora_vers_removed | product(rs_internal_arch_list) | list}}"
   when: not devel|bool
 
-- name: Create cron job for retrace-server
+- name: Create retrace-server reposync cron job for CentOS 7
   cron:
     name: "rs reposync centos 7 x86_64"
     user: retrace
@@ -29,7 +28,7 @@
     state: present
   when: not devel|bool
 
-- name: Create cron job for retrace-server
+- name: Create retrace-server cleanup cron job
   cron:
     name: "retrace-server-cleanup"
     user: retrace