aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-10-29 13:41:28 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-10-29 13:41:28 -0200
commit84af6bf17eccff64721a845359e0eb2ca3befd61 (patch)
tree5e872b215a1f5977a406678ba087b4c934b541ce
parent6bd83286c170bf3882f0dc264e75eed914b5fcdc (diff)
downloadpuppet-nodo-84af6bf17eccff64721a845359e0eb2ca3befd61.tar.gz
puppet-nodo-84af6bf17eccff64721a845359e0eb2ca3befd61.tar.bz2
Require/include fixes
-rw-r--r--manifests/role/master.pp1
-rw-r--r--manifests/role/web.pp1
2 files changed, 1 insertions, 1 deletions
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)