Use hiera for mumble config

diff --git a/manifests/role/mumble.pp b/manifests/role/mumble.pp
index 42a2c3383a1f1bf007092ba4522c34d968727bd8..b24b2c1395b86ae7c77dc25bb9804d6bc323e405 100644 (file)
--- 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 08b0ac7dd848588159f2e22279ad643e736a75b4..9ac06938668fe49c0c0361a5d604096a5a2dc36f 100644 (file)
--- 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 2e3536f8c663c0bdacbdba51aca59f0cd9de5412..cf05c23941f67a5f3220a9d20556b518787501f4 100644 (file)
--- 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' ]: