diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-04-14 17:45:24 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-04-14 17:45:24 -0300 |
| commit | b960c5c296aa35e5568bcc6ed8eb836478dbd316 (patch) | |
| tree | 78169ee51c338a1dff99555be1caa652126fff79 /manifests | |
| parent | 32f6ff204ff1872d6abe0ee42ae60c281a26cb66 (diff) | |
| download | puppet-nodo-b960c5c296aa35e5568bcc6ed8eb836478dbd316.tar.gz puppet-nodo-b960c5c296aa35e5568bcc6ed8eb836478dbd316.tar.bz2 | |
Require dns and websites classes
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/role/dns.pp | 5 | ||||
| -rw-r--r-- | manifests/role/web.pp | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp index a312c91..70cdd84 100644 --- a/manifests/role/dns.pp +++ b/manifests/role/dns.pp @@ -1,7 +1,4 @@ class nodo::role::dns inherits nodo::base::vserver { include bind - - if defined('::dns') { - class { '::dns': } - } + require dns } diff --git a/manifests/role/web.pp b/manifests/role/web.pp index 954d391..4a7a7e6 100644 --- a/manifests/role/web.pp +++ b/manifests/role/web.pp @@ -11,9 +11,7 @@ class nodo::role::web inherits nodo::base::vserver { include nodo::utils::web # The websites class - if defined('websites') { - include websites - } + require websites # Reprepro configuration $reprepro = hiera('nodo::web::reprepro', false) |