diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-09-11 20:22:34 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-09-11 20:22:34 -0300 |
| commit | 155c43c53ef8cb71e2b9567aa58ec1666a754b4a (patch) | |
| tree | 139051576f2756ea7e5949b199a225af46e1748f | |
| parent | 29e0f20bf8489d4a3c338b6b9f18c73464f07fad (diff) | |
| parent | cf675edc9ea5a34f22d64f0e3d2a57487b0d0d54 (diff) | |
| download | puppet-nodo-155c43c53ef8cb71e2b9567aa58ec1666a754b4a.tar.gz puppet-nodo-155c43c53ef8cb71e2b9567aa58ec1666a754b4a.tar.bz2 | |
Merge branch 'master' into develop
| -rw-r--r-- | manifests/role/dns.pp | 4 | ||||
| -rw-r--r-- | manifests/role/master.pp | 4 | ||||
| -rw-r--r-- | manifests/role/web.pp | 4 |
3 files changed, 8 insertions, 4 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..123c1f7 100644 --- a/manifests/role/web.pp +++ b/manifests/role/web.pp @@ -23,8 +23,8 @@ class nodo::role::web inherits nodo::base::vserver { include users::virtual include nodo::utils::web - # The websites class - require websites + # Put your custom sites here + require ::site_websites # Reprepro configuration $reprepro = hiera('nodo::web::reprepro', false) |