index 7c2abe4a98d41ee7a0f1da0dd4e285308d061173..263d9b5f11c3cba6359d1d2724dbdd1ac9a918d2 100644 (file)
-Index: pkg-pnp4nagios/sample-config/pnp/config.php.in
-===================================================================
---- pkg-pnp4nagios.orig/sample-config/pnp/config.php.in 2011-01-24 23:37:42.251054015 +0100
-+++ pkg-pnp4nagios/sample-config/pnp/config.php.in 2011-01-24 23:38:08.707054015 +0100
-@@ -214,12 +214,12 @@
+Description: Install templates into /etc/ rather than /usr/share/.
+ Also, add support for templates.d directory.
+Author: Sven Velt <sven@velt.de>, Sebastian Harl <tokkee@debian.org
+Forwarded: not-needed
+
+--- a/sample-config/pnp/config.php.in
++++ b/sample-config/pnp/config.php.in
+@@ -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';
# 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';
#
$conf['template_dirs'][] = '@datarootdir@/templates.dist';
#
-$conf['special_template_dir'] = '@datarootdir@/templates.special';
+$conf['special_template_dir'] = '@sysconfdir@/templates.special';
-$conf['special_template_dir'] = '@datarootdir@/templates.special';
+$conf['special_template_dir'] = '@sysconfdir@/templates.special';
- ?>
+ #