[Pkg-nagios-changes] [SCM] debian packaging of PNP4Nagios branch, master, updated. v_0_6_13-1-18-g3bbdef1

[Sebastian Harl]

The following commit has been merged in the master branch:
commit f3ee51a9ebf3c128870d50d0327aee65249b0124
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 31 13:54:42 2012 +0100

    patches/adjust-template-path: Added support for /etc/pnp4nagios/templates.d.

diff --git a/debian/changelog b/debian/changelog
index 298b369..9e739eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,10 @@ pnp4nagios (0.6.16-1) unstable; urgency=low
     - Added a note about installation with Icinga referring to the different
       htpasswd.users file location; thanks to Alexander Reichle-Schmehl for
       reporting this (Closes: #646587).
+  * debian/patches/adjust-template-path:
+    - Added support for /etc/pnp4nagios/templates.d.
 
- -- Sebastian Harl <tokkee at debian.org>  Tue, 31 Jan 2012 10:02:43 +0100
+ -- Sebastian Harl <tokkee at debian.org>  Tue, 31 Jan 2012 13:53:51 +0100
 
 pnp4nagios (0.6.13-1) unstable; urgency=low
 
diff --git a/debian/patches/adjust-template-path b/debian/patches/adjust-template-path
index 9e4beeb..263d9b5 100644
--- a/debian/patches/adjust-template-path
+++ b/debian/patches/adjust-template-path
@@ -1,15 +1,19 @@
 Description: Install templates into /etc/ rather than /usr/share/.
-Author: Sven Velt <sven at velt.de>
+ Also, add support for templates.d directory.
+Author: Sven Velt <sven at velt.de>, Sebastian Harl <tokkee at debian.org
 Forwarded: not-needed
 
 --- a/sample-config/pnp/config.php.in
 +++ b/sample-config/pnp/config.php.in
-@@ -214,12 +214,12 @@
+@@ -214,12 +214,15 @@
  # Add your own template directories here
  # First match wins!
  #$conf['template_dirs'][] = '/usr/local/check_mk/pnp-templates';
 -$conf['template_dirs'][] = '@datarootdir@/templates';
 +$conf['template_dirs'][] = '@sysconfdir@/templates';
++foreach (glob("/etc/pnp4nagios/templates.d/*", GLOB_ONLYDIR) as $dirname) {
++	$conf['template_dirs'][] = "$dirname";
++}
  $conf['template_dirs'][] = '@datarootdir@/templates.dist';
  
  #

-- 
debian packaging of PNP4Nagios