summaryrefslogtreecommitdiff
path: root/manifests/defaults
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/defaults')
-rw-r--r--manifests/defaults/commands.pp2
-rw-r--r--manifests/defaults/host_templates.pp3
-rw-r--r--manifests/defaults/service_templates.pp3
-rw-r--r--manifests/defaults/templates.pp14
4 files changed, 20 insertions, 2 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index f2d940b..253ce51 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -21,8 +21,6 @@ class nagios::defaults::commands {
command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$';
check_https_url_regex:
command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -e $ARG3$';
- check_https:
- command_line => '$USER1$/check_http -S -H $HOSTADDRESS$';
check_silc:
command_line => '$USER1$/check_tcp -p 706 -H $ARG1$';
check_sobby:
diff --git a/manifests/defaults/host_templates.pp b/manifests/defaults/host_templates.pp
index 30d7544..699b965 100644
--- a/manifests/defaults/host_templates.pp
+++ b/manifests/defaults/host_templates.pp
@@ -1,5 +1,8 @@
class nagios::defaults::host_templates {
+ # this inoperative for the moment, see :
+ # http://projects.reductivelabs.com/issues/1180
+
nagios_host {
'generic-host':
notifications_enabled => '1',
diff --git a/manifests/defaults/service_templates.pp b/manifests/defaults/service_templates.pp
index 12247a0..326ce05 100644
--- a/manifests/defaults/service_templates.pp
+++ b/manifests/defaults/service_templates.pp
@@ -1,5 +1,8 @@
class nagios::defaults::service_templates {
+ # this inoperative for the moment, see :
+ # http://projects.reductivelabs.com/issues/1180
+
nagios_service {
'generic-service':
active_checks_enabled => '1',
diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp
new file mode 100644
index 0000000..752ba60
--- /dev/null
+++ b/manifests/defaults/templates.pp
@@ -0,0 +1,14 @@
+class nagios::defaults::templates {
+
+ file { 'nagios_templates':
+ path => "${nagios_cfgdir}/conf.d/nagios_templates.cfg",
+ source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/nagios_templates.cfg",
+ "puppet://$server/modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg",
+ "puppet://$server/modules/site-nagios/configs/nagios_templates.cfg",
+ "puppet://$server/modules/nagios/configs/${operatingsystem}/nagios_templates.cfg",
+ "puppet://$server/modules/nagios/configs/nagios_templates.cfg" ],
+ notify => Service['nagios'],
+ mode => 0644, owner => root, group => root;
+ }
+
+}