Require dns and websites classes

diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index a312c9177f6ba6d0cdc5de74880014db9f68436e..70cdd8446b4be7f9cf99c35ef698a7b2a9add346 100644 (file)
--- 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 954d391484ff2bb3dac643ec3d99fe409cd4943c..4a7a7e6f9ab9cc0fdb2aac671bf8a2c90dd99a59 100644 (file)
--- 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)