From aaf55c9ebfa0e34f63b2ca3c2b660e1d164026dd Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 6 May 2013 18:13:12 +0200 Subject: lintify --- manifests/client/debian.pp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index e67ac26..3cfc3fc 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -1,15 +1,16 @@ +# Install the munin client on debian class munin::client::debian inherits munin::client::package { # the plugin will need that - package { "iproute": ensure => installed } + package { 'iproute': ensure => installed } - Service["munin-node"]{ + Service['munin-node']{ # sarge's munin-node init script has no status hasstatus => $::lsbdistcodename ? { sarge => false, default => true } } - File["/etc/munin/munin-node.conf"]{ + File['/etc/munin/munin-node.conf']{ content => template("munin/munin-node.conf.${::operatingsystem}.${::lsbdistcodename}"), } # workaround bug in munin_node_configure - plugin { "postfix_mailvolume": ensure => absent } + plugin { 'postfix_mailvolume': ensure => absent } include munin::plugins::debian } -- cgit v1.2.3 From d2a2cb77b9a9ca5deddecdec3d14ac763388929e Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 3 Nov 2013 17:46:46 +0100 Subject: cleanup openbsd manual installation + remove unnecessary files The manual OpenBSD installation is now so old and not needed anymore. --- manifests/client/debian.pp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index 3cfc3fc..f94356a 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -1,11 +1,18 @@ # Install the munin client on debian -class munin::client::debian inherits munin::client::package { +class munin::client::debian inherits munin::client::base { # the plugin will need that - package { 'iproute': ensure => installed } + package { 'iproute': + ensure => installed + } + + $hasstatus = $::lsbdistcodename ? { + sarge => false, + default => true + } Service['munin-node']{ # sarge's munin-node init script has no status - hasstatus => $::lsbdistcodename ? { sarge => false, default => true } + hasstatus => $hasstatus } File['/etc/munin/munin-node.conf']{ content => template("munin/munin-node.conf.${::operatingsystem}.${::lsbdistcodename}"), -- cgit v1.2.3 From 161e5cb4722ec22dff7f367fcf5460364e598497 Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Mon, 18 Nov 2013 22:27:46 +0100 Subject: use rather ensure_packages --- manifests/client/debian.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index f94356a..63a0e14 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -1,9 +1,7 @@ # Install the munin client on debian class munin::client::debian inherits munin::client::base { # the plugin will need that - package { 'iproute': - ensure => installed - } + ensure_packages(['iproute']) $hasstatus = $::lsbdistcodename ? { sarge => false, -- cgit v1.2.3 From 057658ba93e2562c596dfa5607836679631be916 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 2 Jul 2013 22:49:02 +0200 Subject: Unify OS specific munin-conf.conf In essence all munin-node.conf files contained the same template, besides a few values. By moving all to a single template, maintenance burden is reduced. To ensure all values are still present in the templates, tests are added. --- manifests/client/debian.pp | 3 --- 1 file changed, 3 deletions(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index 63a0e14..f1bbb3c 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -12,9 +12,6 @@ class munin::client::debian inherits munin::client::base { # sarge's munin-node init script has no status hasstatus => $hasstatus } - File['/etc/munin/munin-node.conf']{ - content => template("munin/munin-node.conf.${::operatingsystem}.${::lsbdistcodename}"), - } # workaround bug in munin_node_configure plugin { 'postfix_mailvolume': ensure => absent } include munin::plugins::debian -- cgit v1.2.3 From 39eb7ac31ad7f1fc16c37c42823fb1860c1f09ba Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 9 Jul 2014 23:12:27 +0200 Subject: get rid off lsb facts - who runs sarge? --- manifests/client/debian.pp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'manifests/client/debian.pp') diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index f1bbb3c..49ee567 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -3,15 +3,6 @@ class munin::client::debian inherits munin::client::base { # the plugin will need that ensure_packages(['iproute']) - $hasstatus = $::lsbdistcodename ? { - sarge => false, - default => true - } - - Service['munin-node']{ - # sarge's munin-node init script has no status - hasstatus => $hasstatus - } # workaround bug in munin_node_configure plugin { 'postfix_mailvolume': ensure => absent } include munin::plugins::debian -- cgit v1.2.3