From 44bf4608cab1d06832f049b59c8486bf287d358c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 23 Jul 2014 23:15:10 +0000
Subject: [PATCH] How about this

---
 playbooks/groups/noc.yml                     | 4 ++--
 roles/nagios_server/tasks/main.yml           | 4 ++--
 roles/nagios_server/templates/config.inc.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index a3bfd271ad..ba0a55ae8d 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -66,6 +66,6 @@
   roles:
   - { role: dhcp_server, when: datacenter == 'phx2' }
   - { role: tftp_server, when: datacenter == 'phx2' }
-  - { role: nagios_server, srcdir: nagios, when: datacenter == 'phx2' }
-  - { role: nagios_server, srcdir: nagios-external, when: datacenter != 'phx2' }
+  - { role: nagios_server, nagios_srcdir: "nagios", when: datacenter == 'phx2' }
+  - { role: nagios_server, nagios_srcdir: "nagios-external", when: datacenter != 'phx2' }
   - fedmsg/base
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 79d85076b7..a97681c024 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -31,12 +31,12 @@
   - mod_auth_openid
 
 - name: Copy /etc/nagios config
-  synchronize: archive=yes src={{srcdir|string}}/ dest=/etc/nagios owner=nagios group=nagios
+  synchronize: archive=yes src={{nagios_srcdir}}/ dest=/etc/nagios owner=nagios group=nagios
   tags:
   - nagios-config
 
 - name: Copy checkcommands.cfg
-  template: src={{srcdir}}/checkcommands.cfg dest=/etc/nagios/checkcommands.cfg owner=nagios group=nagios
+  template: src={{nagios_srcdir}}/checkcommands.cfg dest=/etc/nagios/checkcommands.cfg owner=nagios group=nagios
 
 - name: Copy httpd config
   template: src=nagios-httpd.conf dest=/etc/httpd/conf.d/nagios.conf
diff --git a/roles/nagios_server/templates/config.inc.php b/roles/nagios_server/templates/config.inc.php
index 60c1a1c4c8..9ad5123510 100644
--- a/roles/nagios_server/templates/config.inc.php
+++ b/roles/nagios_server/templates/config.inc.php
@@ -2,7 +2,7 @@
 
 $cfg['cgi_config_file']='/etc/nagios/cgi.cfg';  // location of the CGI config file
 
-$cfg['cgi_base_url']='/{{srcdir}}/cgi-bin/';
+$cfg['cgi_base_url']='/{{nagios_srcdir}}/cgi-bin/';
 
 // FILE LOCATION DEFAULTS
 $cfg['main_config_file']='/etc/nagios/nagios.cfg';  // default location of the main Nagios config file