roles/nagios-nrpe/defaults/main.yml

@@ -1,9 +1,11 @@
 ---
-nagios_nrpe_default_allowed_hosts: []
-nagios_nrpe_additional_allowed_hosts: []
+evolix_trusted_ips: []
+additional_trusted_ips: []
+# Let's merge evolix_trusted_ips with additional_trusted_ips
 nagios_nrpe_allowed_hosts:
-  "{{ nagios_nrpe_default_allowed_hosts
-  | union(nagios_nrpe_additional_allowed_hosts) | unique }}"
+  "{{ evolix_trusted_ips | union(additional_trusted_ips) | unique }}"
+nagios_nrpe_ldap_dc: "dc=DOMAIN,dc=EXT"
+nagios_nrpe_ldap_passwd: LDAP_PASSWD
 nagios_nrpe_pgsql_passwd: PGSQL_PASSWD
 nagios_nrpe_amavis_from: "foobar@{{ ansible_domain }}"
 

roles/pf/README.md

@@ -1,13 +0,0 @@
-# PacketFilter
-  
-Custom configuration of PacketFilter.
-
-## Tasks
-
-Everything is in the `tasks/main.yml` file.
-
-## Available variables
-
-* `pf_trusted_ips` : list of IP trusted for important access (default: all).
-
-The full list of variables (with default values) can be found in `defaults/main.yml`.

roles/pf/defaults/main.yml

@@ -1,9 +0,0 @@
----
-
-pf_default_trusted_ips: []
-pf_additional_trusted_ips: []
-# and default to ['0.0.0.0/0'] if the result is still empty
-pf_trusted_ips:
-  "{{ pf_default_trusted_ips | union(pf_additional_trusted_ips)
-  | unique | join(', ')
-  | default(['0.0.0.0/0'], true) }}"

roles/pf/templates/pf.conf.j2

@@ -12,7 +12,7 @@ ext_if="{{ ansible_default_ipv4.device }}"
 ###########################
 
 # Evolix
-table <evolix> { {{ pf_trusted_ips }} }
+table <evolix> { 88.179.18.233, 31.170.9.129, 31.170.8.4 }
 
 # Port en entrée
 # 2222 = ssh secondaire