From d53ba65913d4a312cdb1e7d980b608dc103269d7 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 20:56:01 -0500 Subject: formatting standardization --- manifests/client/package.pp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 84fcf5c..58f40da 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -1,11 +1,11 @@ class munin::client::package inherits munin::client::base { - package { 'munin-node': ensure => installed } - Service['munin-node']{ - require => Package[munin-node], - } - File['/etc/munin/munin-node.conf']{ - # this has to be installed before the package, so the postinst can - # boot the munin-node without failure! - before => Package['munin-node'], - } + package { 'munin-node': ensure => installed } + Service['munin-node']{ + require => Package[munin-node], + } + File['/etc/munin/munin-node.conf']{ + # this has to be installed before the package, so the postinst can + # boot the munin-node without failure! + before => Package['munin-node'], + } } -- cgit v1.2.3 From 8067746d6c6efde6cc3d67177910aa96f9491652 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 22 Dec 2009 21:00:14 -0500 Subject: the 'users' munin plugin seems to be a centos-specific one, so we setup a special munin::plugins::centos and include that in the proper client case statement for centos --- manifests/client/package.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 58f40da..1b124d0 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -8,4 +8,5 @@ class munin::client::package inherits munin::client::base { # boot the munin-node without failure! before => Package['munin-node'], } + include munin::plugins::centos } -- cgit v1.2.3 From a6477f6edc481b7874ae8b3497343d3ad8ad805f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 23 Dec 2009 14:25:02 -0500 Subject: finish settting up splitting the centos bits --- manifests/client/package.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 1b124d0..58f40da 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -8,5 +8,4 @@ class munin::client::package inherits munin::client::base { # boot the munin-node without failure! before => Package['munin-node'], } - include munin::plugins::centos } -- cgit v1.2.3 From a8d3b6af4a63724ca31eab772978a35927797b2b Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Wed, 30 Dec 2009 15:11:39 -0800 Subject: add support for setting munin and munin-node package versions --- manifests/client/package.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 58f40da..482ca4f 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -1,5 +1,10 @@ class munin::client::package inherits munin::client::base { - package { 'munin-node': ensure => installed } + + case $munin-node_ensure_version { + '': { $munin-node_ensure_version = "installed" } + } + + package { 'munin-node': ensure => $munin-node_ensure_version } Service['munin-node']{ require => Package[munin-node], } -- cgit v1.2.3 From da6ded035a7074306587c76e8d3b90cda6b3bdc8 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Wed, 30 Dec 2009 15:34:40 -0800 Subject: can't use - in a variable name --- manifests/client/package.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 482ca4f..7f8a7ba 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -1,10 +1,10 @@ class munin::client::package inherits munin::client::base { - case $munin-node_ensure_version { - '': { $munin-node_ensure_version = "installed" } + case $munin_node_ensure_version { + '': { $munin_node_ensure_version = "installed" } } - package { 'munin-node': ensure => $munin-node_ensure_version } + package { 'munin-node': ensure => $munin_node_ensure_version } Service['munin-node']{ require => Package[munin-node], } -- cgit v1.2.3 From 022e824d8a006f1ef4e742b6af5176daecda1cd0 Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Wed, 30 Dec 2009 21:22:17 -0800 Subject: switch to correct way of checking if the variable is set --- manifests/client/package.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 7f8a7ba..0fc3529 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -1,8 +1,6 @@ class munin::client::package inherits munin::client::base { - case $munin_node_ensure_version { - '': { $munin_node_ensure_version = "installed" } - } + if $munin_node_ensure_version == '' { $munin_node_ensure_version = 'installed' } package { 'munin-node': ensure => $munin_node_ensure_version } Service['munin-node']{ -- cgit v1.2.3 From fefc399e7e28ec871d91089d535073c2bc705009 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 10 Dec 2010 16:35:10 -0500 Subject: this change makes sure that munin-common is installed before munin-node is installed on Debian systems that are not lenny (would be nice if we could use operators for lsbdistcode name like 'if $lsbdistcodename >> "lenny") on Debian Squeeze and later, the munin-node package requires that munin-common be installed. this would normally be handled automatically by the packaging system, but if you utilize the $munin_node_ensure_version variable to set it to the backports version, and you have backports pinned properly (as the shared-apt module does it), it will fail to install the munin-common package from backports. you would think that this change should go in the debian.pp, but that is not possible because debian.pp inherits client/package.pp and thus the order happens wrong --- manifests/client/package.pp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 0fc3529..921d996 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -2,10 +2,24 @@ class munin::client::package inherits munin::client::base { if $munin_node_ensure_version == '' { $munin_node_ensure_version = 'installed' } + if $operatingsystem == "Debian" and $lsbdistcodename != "lenny" { + package { 'munin-common': + before => Package['munin-node'], + ensure => $munin_node_ensure_version; + } + + Package['munin-node']{ + require => Package['munin-common'], + } + } + + package { 'munin-node': ensure => $munin_node_ensure_version } + Service['munin-node']{ require => Package[munin-node], } + File['/etc/munin/munin-node.conf']{ # this has to be installed before the package, so the postinst can # boot the munin-node without failure! -- cgit v1.2.3 From 74f66a8e77b153552ef52efee03187320e1ce877 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 10 Dec 2010 16:48:01 -0500 Subject: standardize formatting --- manifests/client/package.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 921d996..f6e7a08 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -25,4 +25,5 @@ class munin::client::package inherits munin::client::base { # boot the munin-node without failure! before => Package['munin-node'], } + } -- cgit v1.2.3 From a08b5db5d00980233fc5fea21e292f3b433119a0 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 25 Mar 2011 12:07:08 -0400 Subject: fix syntax error as a result of the merge --- manifests/client/package.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/client/package.pp') diff --git a/manifests/client/package.pp b/manifests/client/package.pp index 0ee7443..29f256d 100644 --- a/manifests/client/package.pp +++ b/manifests/client/package.pp @@ -7,7 +7,7 @@ class munin::client::package inherits munin::client::base { before => Package['munin-node'], ensure => $munin_node_ensure_version; } - + } package { 'munin-node': ensure => $munin_node_ensure_version } Service['munin-node']{ require => Package[munin-node], @@ -17,5 +17,5 @@ class munin::client::package inherits munin::client::base { # boot the munin-node without failure! before => Package['munin-node'], } - } } + -- cgit v1.2.3