diff options
Diffstat (limited to 'manifests/subsystem')
| -rw-r--r-- | manifests/subsystem/mail.pp | 8 | ||||
| -rw-r--r-- | manifests/subsystem/virtual/instance.pp | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/manifests/subsystem/mail.pp b/manifests/subsystem/mail.pp index 271a977..0ada682 100644 --- a/manifests/subsystem/mail.pp +++ b/manifests/subsystem/mail.pp @@ -1,7 +1,6 @@ class nodo::subsystem::mail { # Email delivery configuration $mail_delivery = hiera('nodo::subsystem::mail::delivery', 'exim') - $munin = hiera('nodo::host::use_munin', false) case $mail_delivery { 'tunnel': { @@ -13,13 +12,6 @@ class nodo::subsystem::mail { 'postfix', 'disabled': { } '','exim',default: { include exim::tls - - if $munin == true { - munin::plugin { [ 'exim_mailqueue', 'exim_mailstats' ]: - ensure => present, - config => 'user Debian-exim', - } - } } } } diff --git a/manifests/subsystem/virtual/instance.pp b/manifests/subsystem/virtual/instance.pp index a7fead0..a30cf9e 100644 --- a/manifests/subsystem/virtual/instance.pp +++ b/manifests/subsystem/virtual/instance.pp @@ -18,8 +18,6 @@ define nodo::subsystem::virtual::instance( $yacy = false, $rsync = false, $avahi = false, - $munin_port = false, - $monkeysphere_ssh_port = false, $implementation = false ) { # Instance id @@ -55,12 +53,6 @@ define nodo::subsystem::virtual::instance( port_dest => "22", } - firewall::virtual::munin { "$name": - destination => "192.168.0.$context", - port_orig => "49$id", - port_dest => "49$id", - } - if $proxy { class { "firewall::virtual::http": destination => "192.168.0.$context"; |