Skip to content

Commit 0c61e77

Browse files
committed
removed if in our constants.conf
1 parent 149b4e3 commit 0c61e77

2 files changed

Lines changed: 16 additions & 19 deletions

File tree

roles/icinga_agent/defaults/main.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
icinga_agent_package: icinga2
33
icinga_agent_registration: false
44
icinga_agent_ca_host_icinga_port: 5665
5-
icinga_agent_constants_conf_rhel: |
6-
const PluginDir = "/usr/lib64/nagios/plugins"
7-
const PluginContribDir = "/usr/lib64/nagios/plugins"
8-
const ManubulonPluginDir = "/usr/lib64/nagios/plugins"
9-
const ZoneName = "{{ ansible_hostname }}"
10-
const NodeName = "{{ ansible_hostname }}"
11-
const TicketSalt = ""
12-
icinga_agent_constants_conf_debian: |
13-
const PluginDir = "/usr/lib/nagios/plugins"
14-
const PluginContribDir = "/usr/lib/nagios/plugins"
15-
const ManubulonPluginDir = "/usr/lib/nagios/plugins"
16-
const ZoneName = "{{ ansible_hostname }}"
17-
const NodeName = "{{ ansible_hostname }}"
18-
const TicketSalt = ""
5+
icinga_agent_constants:
6+
RedHat: |
7+
const PluginDir = "/usr/lib64/nagios/plugins"
8+
const PluginContribDir = "/usr/lib64/nagios/plugins"
9+
const ManubulonPluginDir = "/usr/lib64/nagios/plugins"
10+
const ZoneName = "{{ ansible_hostname }}"
11+
const NodeName = "{{ ansible_hostname }}"
12+
const TicketSalt = ""
13+
Debian: |
14+
const PluginDir = "/usr/lib/nagios/plugins"
15+
const PluginContribDir = "/usr/lib/nagios/plugins"
16+
const ManubulonPluginDir = "/usr/lib/nagios/plugins"
17+
const ZoneName = "{{ ansible_hostname }}"
18+
const NodeName = "{{ ansible_hostname }}"
19+
const TicketSalt = ""
1920
icinga_agent_api_conf: |
2021
accept_config = true
2122
accept_commands = true
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
# {{ ansible_managed }}
22

3-
{% if ansible_os_family == 'RedHat' %}
4-
{{ icinga_agent_constants_conf_rhel }}
5-
{% elif ansible_os_family == 'Debian' %}
6-
{{ icinga_agent_constants_conf_debian }}
7-
{% endif %}"
3+
{{ icinga_agent_constants[ansible_os_family] }}

0 commit comments

Comments
 (0)