Fixing definitions

diff --git a/manifests/init.pp b/manifests/init.pp
index 941fa4f9f7d4f04b188840099dee3e6facf1a621..0eca3f9cc99bb54a59e958de555f9ac2bd4970db 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,7 +38,7 @@ class nginx::base {
     enable     => true,
     ensure     => running,
     hasrestart => true,
-    require    => [ File["/etc/nginx/sites-enabled/$domain"], Package["nginx"] ],
+    require    => Package["nginx"],
   }
 
   define site($site = $domain, $ensure = present) {
@@ -95,8 +95,8 @@ class nginx inherits nginx::base {
       }
 
       Service["nginx"] {
-        require    => [ File["/etc/nginx/sites-enabled/$domain"],
-                        Package["nginx"],
+        require    => [ Package["nginx"],
+                        File["/etc/nginx/sites-enabled/$domain"],
                         File["/etc/ssl/private/cert.pem"],
                         File["/etc/ssl/certs/cert.crt"] ],
       }
@@ -115,7 +115,7 @@ class nginx::puppetmaster inherits nginx::base {
                $puppetmaster_servers = [ "127.0.0.1:18140" ]) {
 
     file { "/etc/nginx/sites-available/$name":
-      content => "puppetmaster.erb",
+      content => template("nginx/puppetmaster.erb"),
       owner   => "root",
       group   => "root",
       mode    => 0644,