aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/role/mumble.pp5
-rw-r--r--manifests/role/nas.pp2
-rw-r--r--manifests/role/proxy.pp2
3 files changed, 6 insertions, 3 deletions
diff --git a/manifests/role/mumble.pp b/manifests/role/mumble.pp
index 42a2c33..b24b2c1 100644
--- a/manifests/role/mumble.pp
+++ b/manifests/role/mumble.pp
@@ -1,5 +1,8 @@
class nodo::role::mumble inherits nodo::base::virtual {
- include mumble::ssl
+ class { 'mumble::ssl':
+ config_content => hiera('mumble::config_content'),
+ }
+
include mumble::munin
$ecdhforce = hiera('nodo::role::mumble::ecdhforce', false)
diff --git a/manifests/role/nas.pp b/manifests/role/nas.pp
index 08b0ac7..9ac0693 100644
--- a/manifests/role/nas.pp
+++ b/manifests/role/nas.pp
@@ -2,7 +2,7 @@ class nodo::role::nas(
$virtual = false,
) {
# Munin configuration
- $munin = hiera('nodo::host::use_munin', True)
+ $munin = hiera('nodo::host::use_munin', false)
# Minimal utilities
include nodo::utils::network::minimal
diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp
index 2e3536f..cf05c23 100644
--- a/manifests/role/proxy.pp
+++ b/manifests/role/proxy.pp
@@ -1,7 +1,7 @@
class nodo::role::proxy inherits nodo::base::virtual {
class { 'nginx': }
- $munin = hiera('nodo::host::use_munin', True)
+ $munin = hiera('nodo::host::use_munin', false)
if $munin == true {
# Graph nginx
munin::plugin { [ 'nginx_request', 'nginx_status' ]: