From 198654c3f8c8ea7daa6b7b97394ed37e483cb723 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 11 Sep 2015 20:20:17 -0300
Subject: More site_ conventions

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

diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index 6adaf2e..10aabb6 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -1,6 +1,8 @@
 class nodo::role::dns inherits nodo::base::vserver {
   include bind
-  require ::dns
+
+  # Put your custom DNS config in this class
+  require ::site_bind
 
   #munin::plugin { 'named':
   #  ensure => present,
diff --git a/manifests/role/master.pp b/manifests/role/master.pp
index 29c85ee..fb77bcb 100644
--- a/manifests/role/master.pp
+++ b/manifests/role/master.pp
@@ -43,11 +43,13 @@ class nodo::role::master {
   include nodo::role::vserver
   include database
   include git::daemon
-  include websites::admin
   include nagios::headless
   include nagios::defaults
   include nodo::subsystem::monitor::master
 
+  # Put your custom admin sites here
+  require ::site_websites::admin
+
   # Nagios apache workaround
   file { "/etc/apache2/conf.d/nagios3.conf":
     ensure => absent,
diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index 9d3db39..e9c523f 100644
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -24,7 +24,7 @@ class nodo::role::web inherits nodo::base::vserver {
   include nodo::utils::web
 
   # The websites class
-  require websites
+  require ::site_websites
 
   # Reprepro configuration
   $reprepro         = hiera('nodo::web::reprepro', false)
-- 
cgit v1.2.3


From cf675edc9ea5a34f22d64f0e3d2a57487b0d0d54 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 11 Sep 2015 20:22:02 -0300
Subject: More site_ conventions (2)

---
 manifests/role/web.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/role/web.pp b/manifests/role/web.pp
index e9c523f..123c1f7 100644
--- a/manifests/role/web.pp
+++ b/manifests/role/web.pp
@@ -23,7 +23,7 @@ class nodo::role::web inherits nodo::base::vserver {
   include users::virtual
   include nodo::utils::web
 
-  # The websites class
+  # Put your custom sites here
   require ::site_websites
 
   # Reprepro configuration
-- 
cgit v1.2.3