WIP cleanups here and there

Author: zstyblik

defaults/main.yml

@@ -15,20 +15,14 @@ apache_vhosts:
 # apache_mods:
 #   - name: rewrite
 #     state: present
-apache_mods:
-  - name: rewrite
-    state: present
-  - name: ssl
-    state: present
+apache_mods: []
 
 # Only used on Debian/Ubuntu.
 # Example:
 # apache_confs:
 #   - name: trace
 #     state: absent
-apache_confs:
-  - name: trace
-    state: absent
+apache_confs: []
 
 # httpd.conf
 #

tasks/add-vhost.yml

@@ -20,6 +20,7 @@
         _apache_vhost_ssl: "{{ _apache_vhost_ssl_item }}"
   loop: "{{ apache_vhost.ssl }}"
   loop_control:
+    label: "{{ apache_vhost | to_vhost_filename }}"
     loop_var: _apache_vhost_ssl_item
   when:
     - apache_skip_vhost_on_missing_ssl_cert

tasks/configure-Debian.yml

@@ -22,8 +22,9 @@
       vars:
         apache_vhost: "{{ item }}"
   loop: "{{ apache_vhosts }}"
+  # NOTE(zstyblik): cannot use to_vhost_filename until validated.
   loop_control:
-    label: "{{ item | to_vhost_filename }}"
+    label: "{{ item.servername | default('unknown') }}:{{ item.port | default(0) }}"
 
 - name: Gather Binding to Addresses and Ports information.
   apache_ports_generator:
@@ -203,6 +204,8 @@
       vars:
         apache_vhost: "{{ item }}"
   loop: "{{ apache_vhosts }}"
+  loop_control:
+    label: "{{ item | to_vhost_filename }}"
 
 # NOTE(zstyblik): run a2en* regardless
 # re-add check "is in a2q STDOUT", if necessary to save cycles.