Support custom items for blacklists

tasks/blacklists.yml

+---
+# file: roles/haproxy/tasks/blacklists.yml
+
+- name: "Update blacklists"
+  template:
+    src: '{{ item }}'
+    dest: '/etc/haproxy/{{ item }}'
+    owner: 'root'
+    group: 'root'
+    mode: '644'
+  with_items:
+    - 'blacklist.ip'
+    - 'blacklist.referer'
+    - 'blacklist.agent'
+  notify: "Check HAProxy Config"

tasks/configure.yml

@@ -72,19 +72,6 @@
   with_items: '{{ groups.webserver|default([]) }}'
   changed_when: false
 
-- name: "Update blacklists"
-  template:
-    src='{{ item }}'
-    dest='/etc/haproxy/{{ item }}'
-    owner='root'
-    group='root'
-    mode='644'
-  with_items:
-    - 'blacklist.ip'
-    - 'blacklist.referer'
-    - 'blacklist.agent'
-  notify: "Check HAProxy Config"
-
 - name: "Update private ips"
   template:
     src='privatelist.ip.jinja2'

tasks/main.yml

@@ -9,7 +9,12 @@
 
   - import_tasks: install.yml
   - import_tasks: configure.yml
-    tags: 'Config'
+    tags:
+      - 'Config'
+  - import_tasks: blacklists.yml
+    tags:
+      - 'Config'
+      - 'Blacklists'
 
   when: '"haproxy" not in excluded_roles'
 

templates/blacklist.agent

+{% if ansible_local is defined and ansible_local.blacklist is defined %}
+{% for line in ansible_local.blacklist.agent|default([]) %}
+{{line}}
+{% endfor %}
+{% endif %}
 {% for line in proxy_blacklist.agent|default([]) %}
 {{line}}
 {% endfor %}

templates/blacklist.ip

+{% if ansible_local is defined and ansible_local.blacklist is defined %}
+{% for line in ansible_local.blacklist.ip|default([]) %}
+{{line}}
+{% endfor %}
+{% endif %}
 {% for line in proxy_blacklist.ip|default([]) %}
 {{line}}
 {% endfor %}

templates/blacklist.referer

+{% if ansible_local is defined and ansible_local.blacklist is defined %}
+{% for line in ansible_local.blacklist.referer|default([]) %}
+{{line}}
+{% endfor %}
+{% endif %}
 {% for line in proxy_blacklist.referer|default([]) %}
 {{line}}
 {% endfor %}