From f32a29ddfb6f1257e5d271b9b7a894f9a82de590 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Sun, 8 Jan 2017 20:27:35 +0000
Subject: [PATCH] spelling mistages in config figes are deadly

---
 .../files/nagios/configs/nagios.cfg           |  2 +-
 roles/nagios_server/tasks/main.yml            | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/roles/nagios_server/files/nagios/configs/nagios.cfg b/roles/nagios_server/files/nagios/configs/nagios.cfg
index 5828e15af7..0a6d6716ae 100644
--- a/roles/nagios_server/files/nagios/configs/nagios.cfg
+++ b/roles/nagios_server/files/nagios/configs/nagios.cfg
@@ -54,7 +54,7 @@ cfg_file=/etc/nagios/escalations.cfg
 #cfg_dir=/etc/nagios/switches
 #cfg_dir=/etc/nagios/routers
 
-cfg_dif=/etc/nagios/commands
+cfg_dir=/etc/nagios/commands
 cfg_dir=/etc/nagios/contacts
 cfg_dir=/etc/nagios/contactgroups
 cfg_dir=/etc/nagios/hosts
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index c6f78c3de5..2d69dfd153 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -54,6 +54,7 @@
   - /etc/nagios/hostgroups
   - /etc/nagios/services
   - /etc/nagios/servicegroups
+  - /etc/nagios/conf.d
   - /usr/lib64/nagios/plugins/
   - /usr/lib64/nagios/plugins/eventhandlers/
 
@@ -83,13 +84,21 @@
   - nagios_server
 
 ## Copy over the nagios configs
-- name: Copy /etc/nagios/*cfg files
-  copy: src=nagios/configs/{{ item }} dest=/etc/nagios/{{ item }}
+- name: Copy /etc/nagios/conf.d/*cfg files
+  copy: src=nagios/configs/{{ item }} dest=/etc/nagios/conf.d/{{ item }}
   with_items:
     - escalations.cfg  
-    - minimal.cfg
-    - nagios.cfg
     - timeperiods.cfg
+  tags:
+  - config
+  - nagios_server
+
+- name: Copy over the main conf file
+  copy: src=nagios/configs/nagios.cfg dest=etc/nagios mode=0644 group=root owner=root
+  tags:
+  - config
+  - nagios_server
+
 
 ## Copy over the command scripts
 - name: Copy /etc/nagios/commands
@@ -160,7 +169,7 @@
 ## Build template files
 # This one may go to being just a regular config file if we can make remote monitoring work
 - name: Template out the cgi.cfg 
-  template: src=nagios/configs/cgi.cfg.j2 dest=/etc/nagios/ mode=0644 owner=root group=root
+  template: src=nagios/configs/cgi.cfg.j2 dest=/etc/nagios/cgi.cfg mode=0644 owner=root group=root
   tags:
   - nagios_server