diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/role/dns.pp | 4 | ||||
| -rw-r--r-- | manifests/role/jabber.pp | 6 | ||||
| -rw-r--r-- | manifests/role/mail.pp | 16 | ||||
| -rw-r--r-- | manifests/role/master.pp | 8 | ||||
| -rw-r--r-- | manifests/role/mumble.pp | 2 | ||||
| -rw-r--r-- | manifests/role/nas.pp | 15 | ||||
| -rw-r--r-- | manifests/role/proxy.pp | 14 | ||||
| -rw-r--r-- | manifests/role/web.pp | 18 | ||||
| -rw-r--r-- | manifests/subsystem/mail.pp | 8 | ||||
| -rw-r--r-- | manifests/subsystem/virtual/instance.pp | 8 |
10 files changed, 0 insertions, 99 deletions
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp index 473e7a8..6fb5796 100644 --- a/manifests/role/dns.pp +++ b/manifests/role/dns.pp @@ -3,8 +3,4 @@ class nodo::role::dns inherits nodo::base::virtual { # Put your custom DNS config in this class require ::site_bind - - #munin::plugin { 'named': - # ensure => present, - #} } diff --git a/manifests/role/jabber.pp b/manifests/role/jabber.pp index 1782fce..59c2c87 100644 --- a/manifests/role/jabber.pp +++ b/manifests/role/jabber.pp @@ -33,10 +33,4 @@ class nodo::role::jabber inherits nodo::base::virtual { notify => Service['ejabberd'], require => File['/etc/ejabberd/ssl/private'], } - - #munin::plugin { [ 'ejabberd_connections', 'ejabberd_memory', 'ejabberd_registrations', - # 'ejabberd_statuses', 'ejabberd_threads', 'ejabberd_uptime', - # 'ejabberd_users', 'ejabberd_usersindays' ]: - # ensure => 'ejabberd_', - #} } diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp index 87a928b..81fe6c9 100644 --- a/manifests/role/mail.pp +++ b/manifests/role/mail.pp @@ -1,19 +1,3 @@ class nodo::role::mail { class { [ 'nodo::role::virtual', 'mail::system' ]: } - - # Graph postfix - munin::plugin { [ 'postfix_mailqueue', 'postfix_mailstats' ]: - config => 'user root', - ensure => present, - } - - # Graph mysql, needed by munin mysql plugin - package { 'libcache-cache-perl': - ensure => present, - } - - munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]: - config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", - ensure => present, - } } diff --git a/manifests/role/master.pp b/manifests/role/master.pp index b5ce290..13c689c 100644 --- a/manifests/role/master.pp +++ b/manifests/role/master.pp @@ -12,9 +12,6 @@ class nodo::role::master { main => true, } - include munin::host - include munin::plugins::muninhost - # The main master has a host entry pointing to itself, other # masters still retrieve catalogs from the main master. # @@ -32,11 +29,6 @@ class nodo::role::master { host { "puppet": ensure => absent, } - - # Quick and dirty way to keep munin disabled - package { 'munin': - ensure => purged, - } } # These should be included after puppetmaster diff --git a/manifests/role/mumble.pp b/manifests/role/mumble.pp index b24b2c1..c9b26f2 100644 --- a/manifests/role/mumble.pp +++ b/manifests/role/mumble.pp @@ -3,8 +3,6 @@ class nodo::role::mumble inherits nodo::base::virtual { config_content => hiera('mumble::config_content'), } - include mumble::munin - $ecdhforce = hiera('nodo::role::mumble::ecdhforce', false) if $ecdhforce == true { diff --git a/manifests/role/nas.pp b/manifests/role/nas.pp index 9ac0693..29517df 100644 --- a/manifests/role/nas.pp +++ b/manifests/role/nas.pp @@ -1,9 +1,6 @@ class nodo::role::nas( $virtual = false, ) { - # Munin configuration - $munin = hiera('nodo::host::use_munin', false) - # Minimal utilities include nodo::utils::network::minimal @@ -81,12 +78,6 @@ class nodo::role::nas( class { 'nfs': server => true; } - - if $munin == true { - munin::plugin { [ 'nfsd4' ]: - ensure => present, - } - } } # @@ -190,12 +181,6 @@ class nodo::role::nas( default => undef, }, } - - if $munin == true { - munin::plugin { [ 'samba' ]: - ensure => present, - } - } } # diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp index cf05c23..bca9bbf 100644 --- a/manifests/role/proxy.pp +++ b/manifests/role/proxy.pp @@ -1,20 +1,6 @@ class nodo::role::proxy inherits nodo::base::virtual { class { 'nginx': } - $munin = hiera('nodo::host::use_munin', false) - if $munin == true { - # Graph nginx - munin::plugin { [ 'nginx_request', 'nginx_status' ]: - ensure => present, - config => 'env.url http://localhost/nginx_status', - } - - # Needed by munin plugins - package { 'liblwp-useragent-determined-perl': - ensure => installed, - } - } - # TODO: Apt cacher: still buggy and needs hardening #package { 'apt-cacher-ng': # ensure => present, diff --git a/manifests/role/web.pp b/manifests/role/web.pp index 2d25c9c..f315418 100644 --- a/manifests/role/web.pp +++ b/manifests/role/web.pp @@ -5,24 +5,6 @@ class nodo::role::web inherits nodo::base::virtual { include onion } - # Munin - #$munin = hiera('nodo::munin_node::manage', True) - #if $munin == true { - # munin::plugin { [ 'apache_accesses', 'apache_processes', 'apache_volume' ]: - # ensure => present, - # } - # - # # Needed by munin mysql plugin - # package { 'libcache-cache-perl': - # ensure => present, - # } - # - # munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]: - # ensure => present, - # config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", - # } - #} - # Classes for web nodes include database include websites 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"; |