a2 checks in seperate files

tasks/a2conf.yml

@@ -3,40 +3,7 @@
   block:
 
     - name: Check loaded conf
-      block:
-
-        - name: Register the loaded conf
-          command: a2query -c
-          check_mode: false
-          changed_when: false
-          register: apache_conf_check
-
-      rescue:
-
-        - name: No conf enabled
-          set_fact:
-            apache_conf_loaded: []
-          when: '"No conf matches" in apache_conf_check.stderr'
-
-    - name: Debug the loaded conf
-      debug:
-        var: apache_conf_check.stdout_lines
-        verbosity: 2
-      when: apache_conf_check.stdout is defined
-
-    - name: Set an array of the loaded conf
-      set_fact:
-        apache_conf_loaded: "{{ apache_conf_loaded | default([]) + [ line.split(' ')[0] ] }}"
-      when: apache_conf_check.stdout is defined
-      loop: "{{ apache_conf_check.stdout_lines }}"
-      loop_control:
-        loop_var: line
-        label: "{{ line }}"
-
-    - name: Debug loaded conf
-      debug:
-        var: apache_conf_loaded
-        verbosity: 2
+      include_tasks: a2conf_check.yml
 
     - name: Apache conf disabled
       command: "a2disconf {{ conf }}"

tasks/a2conf_check.yml

+---
+- name: Check Apache conf
+  block:
+
+    - name: Check loaded conf
+      block:
+
+        - name: Register the loaded conf
+          command: a2query -c
+          check_mode: false
+          changed_when: false
+          register: apache_conf_check
+
+      rescue:
+
+        - name: No conf enabled
+          set_fact:
+            apache_conf_loaded: []
+          when: '"No conf matches" in apache_conf_check.stderr'
+
+    - name: Debug the loaded conf
+      debug:
+        var: apache_conf_check.stdout_lines
+        verbosity: 2
+      when: apache_conf_check.stdout is defined
+
+    - name: Set an array of the loaded conf
+      set_fact:
+        apache_conf_loaded: "{{ apache_conf_loaded | default([]) + [ line.split(' ')[0] ] }}"
+      when: apache_conf_check.stdout is defined
+      loop: "{{ apache_conf_check.stdout_lines }}"
+      loop_control:
+        loop_var: line
+        label: "{{ line }}"
+
+    - name: Debug loaded conf
+      debug:
+        var: apache_conf_loaded
+        verbosity: 2
+
+  tags:
+    - apache
+...

tasks/a2mod.yml

 ---
-- name: Apache module checks
-  block:
-
-    - name: Check loaded modules
-      block:
-
-        - name: Register the loaded modules
-          command: a2query -m
-          check_mode: false
-          changed_when: false
-          register: apache_modules_check
-
-      rescue:
-
-        - name: No mod enabled
-          set_fact:
-            apache_modules_loaded: []
-          when: ( "No module matches" in apache_modules_check.stderr )
-
-    - name: Debug the loaded modules
-      debug:
-        var: apache_modules_check.stdout_lines
-        verbosity: 2
-      when: apache_modules_check.stdout is defined
-
-    - name: Set an array of the loaded modules
-      set_fact:
-        apache_modules_loaded: "{{ apache_modules_loaded | default([]) + [ line.split(' ')[0] ] }}"
-      when: apache_modules_check.stdout is defined
-      loop: "{{ apache_modules_check.stdout_lines }}"
-      loop_control:
-        loop_var: line
-        label: "{{ line }}"
-
-    - name: Debug loaded modules
-      debug:
-        var: apache_modules_loaded
-        verbosity: 2
-      when: apache_modules_loaded is defined
-
+- name: Check loaded modules
+  include_tasks: a2mod_check.yml
   tags:
     - apache
 

tasks/a2mod_check.yml

+---
+- name: Apache module checks
+  block:
+
+    - name: Check loaded modules
+      block:
+
+        - name: Register the loaded modules
+          command: a2query -m
+          check_mode: false
+          changed_when: false
+          register: apache_modules_check
+
+      rescue:
+
+        - name: No mod enabled
+          set_fact:
+            apache_modules_loaded: []
+          when: ( "No module matches" in apache_modules_check.stderr )
+
+    - name: Debug the loaded modules
+      debug:
+        var: apache_modules_check.stdout_lines
+        verbosity: 2
+      when: apache_modules_check.stdout is defined
+
+    - name: Set an array of the loaded modules
+      set_fact:
+        apache_modules_loaded: "{{ apache_modules_loaded | default([]) + [ line.split(' ')[0] ] }}"
+      when: apache_modules_check.stdout is defined
+      loop: "{{ apache_modules_check.stdout_lines }}"
+      loop_control:
+        loop_var: line
+        label: "{{ line }}"
+
+    - name: Debug loaded modules
+      debug:
+        var: apache_modules_loaded
+        verbosity: 2
+      when: apache_modules_loaded is defined
+
+  tags:
+    - apache
+...

tasks/a2site.yml

@@ -3,41 +3,7 @@
   block:
 
     - name: Check loaded sites
-      block:
-
-        - name: Register the loaded sites
-          command: a2query -s
-          check_mode: false
-          changed_when: false
-          register: apache_sites_check
-
-      rescue:
-
-        - name: No sites enabled
-          set_fact:
-            apache_sites_loaded: []
-          when: ( "No site matches" in apache_sites_check.stderr )
-
-    - name: Debug the loaded sites
-      debug:
-        var: apache_sites_check.stdout_lines
-        verbosity: 2
-      when: apache_sites_check.stdout is defined
-
-    - name: Set an array of the loaded sites
-      set_fact:
-        apache_sites_loaded: "{{ apache_sites_loaded | default([]) + [ line.split(' ')[0] ] }}"
-      when: apache_sites_check.stdout is defined
-      loop: "{{ apache_sites_check.stdout_lines }}"
-      loop_control:
-        loop_var: line
-        label: "{{ line }}"
-
-    - name: Debug loaded sites
-      debug:
-        var: apache_sites_loaded
-        verbosity: 2
-      when: apache_sites_loaded is defined
+      include_tasks: a2sites_check.yml
 
     - name: Apache sites disabled
       command: "a2dissite {{ site }}"

tasks/a2site_check.yml

+---
+- name: Apache sites checked
+  block:
+
+    - name: Check loaded sites
+      block:
+
+        - name: Register the loaded sites
+          command: a2query -s
+          check_mode: false
+          changed_when: false
+          register: apache_sites_check
+
+      rescue:
+
+        - name: No sites enabled
+          set_fact:
+            apache_sites_loaded: []
+          when: ( "No site matches" in apache_sites_check.stderr )
+
+    - name: Debug the loaded sites
+      debug:
+        var: apache_sites_check.stdout_lines
+        verbosity: 2
+      when: apache_sites_check.stdout is defined
+
+    - name: Set an array of the loaded sites
+      set_fact:
+        apache_sites_loaded: "{{ apache_sites_loaded | default([]) + [ line.split(' ')[0] ] }}"
+      when: apache_sites_check.stdout is defined
+      loop: "{{ apache_sites_check.stdout_lines }}"
+      loop_control:
+        loop_var: line
+        label: "{{ line }}"
+
+    - name: Debug loaded sites
+      debug:
+        var: apache_sites_loaded
+        verbosity: 2
+      when: apache_sites_loaded is defined
+
+  tags:
+    - apache
+...

tasks/checks.yml

@@ -249,6 +249,15 @@
       check_mode: false
       register: apache_cert
 
+    - name: Include mod checks
+      include_tasks: a2mod_checks.yml
+
+    - name: Include conf checks
+      include_tasks: a2conf_checks.yml
+
+    - name: Include site checks
+      include_tasks: a2site_checks.yml
+
   tags:
     - apache
 ...