From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 29 Oct 2015 15:41:28 +0000 (-0200)
Subject: Require/include fixes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=84af6bf17eccff64721a845359e0eb2ca3befd61;p=puppet-nodo.git

Require/include fixes
---

diff --git a/manifests/role/master.pp b/manifests/role/master.pp
index 76bdf29..b5ce290 100644
--- 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 87401e0..cd536e1 100644
--- 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)