[nagios] * Add cfg_dir=/etc/nagios/conf.d to the main nagios configuration file

[Jose Pedro Oliveira]

commit ddbbd4cc9a5f29f7c51235f295061ce394598d4b
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Wed Apr 24 02:07:54 2013 +0100

     * Add cfg_dir=/etc/nagios/conf.d to the main nagios configuration file

 nagios-3.5.0-conf.d-configuration-directory.patch |   12 ++++++++++++
 nagios.spec                                       |    4 ++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/nagios-3.5.0-conf.d-configuration-directory.patch b/nagios-3.5.0-conf.d-configuration-directory.patch
new file mode 100644
index 0000000..12662fb
--- /dev/null
+++ b/nagios-3.5.0-conf.d-configuration-directory.patch
@@ -0,0 +1,12 @@
+diff -ruN nagios/sample-config/nagios.cfg.in nagios-modified/sample-config/nagios.cfg.in
+--- nagios/sample-config/nagios.cfg.in	2012-11-12 18:33:37.000000000 +0000
++++ nagios-modified/sample-config/nagios.cfg.in	2013-04-24 00:59:54.380245378 +0100
+@@ -54,6 +54,8 @@
+ #cfg_dir=@sysconfdir@/switches
+ #cfg_dir=@sysconfdir@/routers
+ 
++cfg_dir=@sysconfdir@/conf.d
++
+ 
+ 
+ 
diff --git a/nagios.spec b/nagios.spec
index 170a806..1e2a010 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -34,6 +34,7 @@ Patch10: nagios-0010-Added-several-images-to-the-sample-config-revb.patch
 Patch11: nagios-0011-Fixed-strange-permissions.patch
 Patch12: nagios-3.4.3-httpd-2.4-and-2.2.patch
 Patch13: nagios-3.4.3-spaces-to-plus-signs.patch
+Patch14: nagios-3.5.0-conf.d-configuration-directory.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -140,6 +141,7 @@ may compile against.
 %patch11 -p1 -b .fix_perms
 %patch12 -p1 -b .httpd_conf
 %patch13 -p1 -b .plus_signs
+%patch14 -p1 -b .conf_d
 
 install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/
 
@@ -281,6 +283,8 @@ fi
 
 %changelog
 * Wed Apr 24 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.5.0-3
+- Add cfg_dir=/etc/nagios/conf.d to the main nagios configuration file
+  (nagios-3.5.0-conf.d-configuration-directory.patch) (#907145#c5)
 - Own the configuration directory /etc/nagios/conf.d (#907145#c5)
 - Ship the internet.cfg configuration file as documentation (#907145#c5)