Merge remote branch 'ng/master'

6 files changed, 42 insertions, 33 deletions

diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index 05460f5..bbb6ce5 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -49,7 +49,7 @@ class nagios::defaults::commands {
             command_line => '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -e';
           check_ssh:
             command_line => '$USER1$/check_ssh $HOSTADDRESS$';
-          check_ssh_port:
+          ssh_port:
             command_line => '$USER1$/check_ssh -p $ARG1$ $HOSTADDRESS$';
           check_http:
             command_line => '$USER1$/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$';
diff --git a/manifests/defaults/host_templates.pp b/manifests/defaults/host_templates.pp
index 699b965..0f47324 100644
--- a/manifests/defaults/host_templates.pp
+++ b/manifests/defaults/host_templates.pp
@@ -12,12 +12,12 @@ class nagios::defaults::host_templates {
             process_perf_data               => '1',
             retain_status_information       => '1',
             retain_nonstatus_information    => '1',
-		    check_command                   => 'check-host-alive',
-		    max_check_attempts              => '10',
-		    notification_interval           => '0',
-		    notification_period             => '24x7',
-		    notification_options            => 'd,u,r',
-		    contact_groups                  => 'admins',
+            check_command                   => 'check-host-alive',
+            max_check_attempts              => '10',
+            notification_interval           => '0',
+            notification_period             => '24x7',
+            notification_options            => 'd,u,r',
+            contact_groups                  => 'admins',
             register                        => '0',
         }
 
diff --git a/manifests/defaults/hostgroups.pp b/manifests/defaults/hostgroups.pp
index 3a4f4d1..8715ade 100644
--- a/manifests/defaults/hostgroups.pp
+++ b/manifests/defaults/hostgroups.pp
@@ -1,13 +1,11 @@
 class nagios::defaults::hostgroups {
-
-    nagios_hostgroup {
-        'all':
-            alias   => 'All Servers',
-    		members => '*';
-        'debian-servers':
-            alias   => 'Debian GNU/Linux Servers';
-        'centos-servers':
-            alias   => 'CentOS GNU/Linux Servers';
-        }
-
+  nagios_hostgroup {
+    'all':
+      alias   => 'All Servers',
+    	members => '*';
+    'debian-servers':
+      alias   => 'Debian GNU/Linux Servers';
+    'centos-servers':
+      alias   => 'CentOS GNU/Linux Servers';
+  }
 }
diff --git a/manifests/defaults/service_templates.pp b/manifests/defaults/service_templates.pp
index 326ce05..84740af 100644
--- a/manifests/defaults/service_templates.pp
+++ b/manifests/defaults/service_templates.pp
@@ -17,15 +17,15 @@ class nagios::defaults::service_templates {
             process_perf_data               => '1',
             retain_status_information       => '1',
             retain_nonstatus_information    => '1',
-		    notification_interval           => '0',
-		    is_volatile                     => '0',
-		    check_period                    => '24x7',
-		    normal_check_interval           => '5',
-		    retry_check_interval            => '1',
-		    max_check_attempts              => '4',
-		    notification_period             => '24x7',
-		    notification_options            => 'w,u,c,r',
-		    contact_groups                  => 'admins',
+            notification_interval           => '0',
+            is_volatile                     => '0',
+            check_period                    => '24x7',
+            normal_check_interval           => '5',
+            retry_check_interval            => '1',
+            max_check_attempts              => '4',
+            notification_period             => '24x7',
+            notification_options            => 'w,u,c,r',
+            contact_groups                  => 'admins',
             register                        => '0',
         }
 
diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp
index 752ba60..c97eee4 100644
--- a/manifests/defaults/templates.pp
+++ b/manifests/defaults/templates.pp
@@ -1,12 +1,13 @@
 class nagios::defaults::templates {
+    include nagios::defaults::vars
 
     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" ],
+            path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_templates.cfg",
+            source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios_templates.cfg",
+                        "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg",
+                        "puppet:///modules/site-nagios/configs/nagios_templates.cfg",
+                        "puppet:///modules/nagios/configs/${operatingsystem}/nagios_templates.cfg",
+                        "puppet:///modules/nagios/configs/nagios_templates.cfg" ],
             notify => Service['nagios'],
             mode => 0644, owner => root, group => root;
     }
diff --git a/manifests/defaults/vars.pp b/manifests/defaults/vars.pp
new file mode 100644
index 0000000..6302f13
--- /dev/null
+++ b/manifests/defaults/vars.pp
@@ -0,0 +1,10 @@
+class nagios::defaults::vars {
+  case $nagios_cfgdir {
+    '': { $int_nagios_cfgdir = $operatingsystem ? {
+            centos => '/etc/nagios/',
+            default => '/etc/nagios3'
+          }
+    }
+    default: { $int_nagios_cfgdir = $nagios_cfgdir }
+  }
+}