More site_ conventions

diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index 6adaf2e77bd5a9792996a810deed65d50f5542ee..10aabb66a8cc4cb3647b3fdca034f6735218bd52 100644 (file)
--- 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 29c85ee326555b0b7393ead8cb77c5c65e9091dd..fb77bcb54b1780ffb1755de52f578401a82948d7 100644 (file)
--- 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 9d3db39463772eeb3fc1055bbc268fb3570c482e..e9c523fed2b6e92ac7644692915515339c58f02f 100644 (file)
--- 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)