WIP

manifests/vagrant.pp

@@ -3,7 +3,7 @@ node /^lucid32$/ {
 
     #include ips
     #include user-kbsingh
-    #include nagios-server
+    include nagios-server
     #include ci-ssh-slave
     #include haproxy-main
     #include mirrorbrain

modules/nagios-server/manifests/init.pp

@@ -1,5 +1,12 @@
 
 class nagios-server {
+    if $operatingsystem != "Ubuntu" {
+        err("The nagios-server module isn't supported for $operatingsystem")
+    }
+    else {
+        include  nagios-server::ubuntu
+    }
+
     group {
         "nagios" :
             ensure  => present;
@@ -13,24 +20,4 @@ class nagios-server {
                         Group["nagios"]
                        ];
     }
-
-
-    file {
-        "/etc/nagios" :
-            ensure  => directory,
-            require => [
-                        Group["nagios"],
-                        Package["nagios"],
-                        Package["nagios-plugins"],
-                        Package["nagios-nrpe"]
-                       ]
-    }
-
-
-    if $operatingsystem != "Ubuntu" {
-        err("The nagios-server module isn't supported for $operatingsystem")
-    }
-    else {
-        include  nagios-server::ubuntu
-    }
 }

modules/nagios-server/manifests/ubuntu.pp

@@ -12,11 +12,9 @@ class nagios-server::ubuntu {
 class nagios-server::ubuntu::packages {
     package {
         "libwww-perl" :
-            alias   => perl-libwww,
             ensure  => installed;
 
         "libcrypt-ssleay-perl" :
-            alias   => perl-crypt-ssleay,
             ensure  => installed;
 
         "nagios3" :
@@ -38,6 +36,6 @@ class nagios-server::ubuntu::install {
         "nagios3" :
             ensure => running,
             enable => true,
-            require => Package["nagios3"];
+            require => Package["nagios"];
     }
 }