Require/include fixes

diff --git a/manifests/role/master.pp b/manifests/role/master.pp
index 76bdf296e070d1d0fc1d6b4aebe3c71092465894..b5ce290d26f441c31b3d38c02c6cce8d63d2af02 100644 (file)
--- a/manifests/role/master.pp
+++ b/manifests/role/master.pp
@@ -46,6 +46,7 @@ class nodo::role::master {
   include nagios::headless
   include nagios::defaults
   include nodo::subsystem::monitor::master
+  include websites
 
   # Nagios apache workaround
   file { "/etc/apache2/conf.d/nagios3.conf":

diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index 87401e0165dc7fd6c1b01bded6f8c80425e06178..cd536e17a033ee04b37fd74862472bb33ab37812 100644 (file)
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -28,7 +28,6 @@ class nodo::role::web inherits nodo::base::virtual {
 
   # Put your custom sites and users here
   include websites
-  require ::site_users::virtual
 
   # Reprepro configuration
   $reprepro         = hiera('nodo::web::reprepro', false)