From c0d9ca41b09094b1973c5cf9f13838aec5b7af99 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 17 Feb 2010 18:28:27 -0200
Subject: Fixing definitions

---
 manifests/init.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 941fa4f..0eca3f9 100644
--- 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,
-- 
cgit v1.2.3