diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/role/dns.pp | 4 | ||||
| -rw-r--r-- | manifests/role/master.pp | 4 | ||||
| -rw-r--r-- | 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)  | 
