From b960c5c296aa35e5568bcc6ed8eb836478dbd316 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 14 Apr 2013 17:45:24 -0300
Subject: Require dns and websites classes

---
 manifests/role/dns.pp | 5 +----
 manifests/role/web.pp | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'manifests/role')

diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index a312c91..70cdd84 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -1,7 +1,4 @@
 class nodo::role::dns inherits nodo::base::vserver {
   include bind
-
-  if defined('::dns') {
-    class { '::dns': }
-  }
+  require dns
 }
diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index 954d391..4a7a7e6 100644
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -11,9 +11,7 @@ class nodo::role::web inherits nodo::base::vserver {
   include nodo::utils::web
 
   # The websites class
-  if defined('websites') {
-    include websites
-  }
+  require websites
 
   # Reprepro configuration
   $reprepro         = hiera('nodo::web::reprepro', false)
-- 
cgit v1.2.3