From 88e544bf537ddb9985a6c6ab890a85dac010e829 Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Mon, 12 Jun 2023 11:11:30 +0100 Subject: [PATCH] zabbix: readd base roles Signed-off-by: David Kirwan --- playbooks/groups/zabbix.yml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/playbooks/groups/zabbix.yml b/playbooks/groups/zabbix.yml index 2b7bb2012c..ddfcf35c53 100644 --- a/playbooks/groups/zabbix.yml +++ b/playbooks/groups/zabbix.yml @@ -13,9 +13,25 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - tasks: - - name: Run the zabbix_server Role - include_role: - name: zabbix/zabbix_server - tasks_from: main + roles: + - base + - rkhunter + - hosts + - ipa/client + - role: keytab/service + owner_user: apache + owner_group: apache + service: HTTP + host: "zabbix{{env_suffix}}.fedoraproject.org" + when: datacenter == 'iad2' + - role: keytab/service + owner_user: apache + owner_group: apache + service: HTTP + host: "zabbix{{env_suffix}}.fedoraproject.org" + when: datacenter != 'iad2' + - collectd/base + - apache + - sudo + - zabbix/zabbix_server