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/apache2/manifests/init.pp

@@ -6,12 +6,15 @@ class apache2 {
     else {
         package {
             "apache2" :
-                alias => "apache2",
                 ensure  => installed;
         }
 
         service {
             "apache2" :
+                ensure => running,
+                hasstatus => true,
+                hasrestart => true,
+                require => Package["apache2"],
                 enable => true;
         }
     }

modules/nagios-server/manifests/init.pp

@@ -1,41 +1,23 @@
 
 class nagios-server {
+    if $operatingsystem != "Ubuntu" {
+        err("The nagios-server module isn't supported for $operatingsystem")
+    }
+    else {
+        include  nagios-server::ubuntu
+    }
+
     group {
         "nagios" :
-            gid     => 4001,
             ensure  => present;
     }
 
     user {
         "nagios" :
-            uid     => 4001,
-            gid     => 4001,
             ensure  => present,
             require => [
                         File["/etc/nagios"],
                         Group["nagios"]
                        ];
     }
-
-
-    file {
-        "/etc/nagios" :
-            ensure  => directory,
-            require => [
-                        Group["nagios"],
-                        Package["nagios"],
-                        Package["nagios-plugins"],
-                        Package["nagios-nrpe"]
-                       ]
-    }
-
-
-    # I think it's safe to assume that if we're not on CentOS, we're running on
-    # Ubuntu
-    if $operatingsystem == "CentOS" {
-        include  nagios-server::centos
-    }
-    else {
-        include  nagios-server::ubuntu
-    }
 }

modules/nagios-server/manifests/ubuntu.pp

@@ -1,13 +1,20 @@
 class nagios-server::ubuntu {
-    require pkg-apache2
+    include apache2
+    include nagios-server::ubuntu::packages
+    include nagios-server::ubuntu::install
 
+    Class["apache2"] ->
+        Class["nagios-server::ubuntu::packages"] ->
+            Class["nagios-server::ubuntu::install"]
+}
+
+
+class nagios-server::ubuntu::packages {
     package {
         "libwww-perl" :
-            alias   => perl-libwww,
             ensure  => installed;
 
         "libcrypt-ssleay-perl" :
-            alias   => perl-crypt-ssleay,
             ensure  => installed;
 
         "nagios3" :
@@ -23,3 +30,12 @@ class nagios-server::ubuntu {
             ensure  => installed;
     }
 }
+
+class nagios-server::ubuntu::install {
+    service {
+        "nagios3" :
+            ensure => running,
+            enable => true,
+            require => Package["nagios"];
+    }
+}