Fixing syntax problems.

diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp
index c0474fec997a3d96a5d50071c06460bb4b77fdbf..a13070cb27c2883cd6917d8b22b817bd617ab1bb 100644 (file)
--- a/manifests/puppetmasterd.pp
+++ b/manifests/puppetmasterd.pp
@@ -40,36 +40,37 @@ class puppetmasterd {
     notify  => Service['puppetmaster'],
   }
 
-  if $puppetmaster_servertype  == 'mongrel' {
-    if !defined(Package["mongrel"]) {
-      package { "mongrel":
-        ensure => installed,
+  case $puppetmaster_servertype {
+    'mongrel': {
+      case defined(Package["mongrel"]) {
+        false: { package { "mongrel": ensure => installed, } }
+      } 
+
+      service { "puppetmaster":
+        enable     => true,
+        ensure     => running,
+        hasrestart => true,
+        require    => [ Package['puppetmaster'], Package['mongrel'] ],
       }
-    }
-
-    service { "puppetmaster":
-      enable     => true,
-      ensure     => running,
-      hasrestart => true,
-      require    => Package['puppetmaster'], Package['mongrel'],
-    }
 
-    nginx::puppetmaster::proxy{ "puppet.$domain":
-      $worker_processes     => 4,
-      $worker_connections   => 1024,
-      $ssl_port             => 8140,
-      $non_ssl_port         => 8141,
-      $puppetmaster_servers => [ "127.0.0.1:18140",
-                                 "127.0.0.1:18141",
-                                 "127.0.0.1:18142",
-                                 "127.0.0.1:18143", ],
+      nginx::puppetmaster::proxy{ "puppet.$domain":
+        worker_processes     => 4,
+        worker_connections   => 1024,
+        ssl_port             => 8140,
+        non_ssl_port         => 8141,
+        puppetmaster_servers => [ "127.0.0.1:18140",
+                                  "127.0.0.1:18141",
+                                  "127.0.0.1:18142",
+                                  "127.0.0.1:18143" ],
+      }
     }
-  } else {
-    service { "puppetmaster":
-      enable     => true,
-      ensure     => running,
-      hasrestart => true,
-      require    => Package['puppetmaster'],
+    default: {
+      service { "puppetmaster":
+        enable     => true,
+        ensure     => running,
+        hasrestart => true,
+        require    => Package['puppetmaster'],
+      }
     }
   }