diff options
author | Gabriel Filion <gabster@lelutin.ca> | 2014-12-13 09:34:56 -0500 |
---|---|---|
committer | Gabriel Filion <gabster@lelutin.ca> | 2014-12-13 10:21:25 -0500 |
commit | 48272434978f95c70e34aebe9ce188157f8f935e (patch) | |
tree | 8c940d891cbcba026d56cf8ed2935361debc44fd /manifests/plugins/gentoo.pp | |
parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
parent | 27c9a5dbc2083dcc20d059008702dd3f75382bcc (diff) |
Merge remote-tracking branch 'immerda/master' into merge_immerda
Conflicts:
manifests/plugins/interfaces.pp
$real_ifs was changed on master and we'd like to keep that change
$ifs was changed to use the prefix() function and we'd like to keep that
change.
Diffstat (limited to 'manifests/plugins/gentoo.pp')
-rw-r--r-- | manifests/plugins/gentoo.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/plugins/gentoo.pp b/manifests/plugins/gentoo.pp index 27d4689..36f2370 100644 --- a/manifests/plugins/gentoo.pp +++ b/manifests/plugins/gentoo.pp @@ -1,4 +1,5 @@ -class munin::plugins::gentoo { +# Set up the plugins for a gentoo host +class munin::plugins::gentoo { munin::plugin::deploy { 'gentoo_lastupdated': config => "user portage\nenv.logfile /var/log/emerge.log\nenv.tail /usr/bin/tail\nenv.grep /bin/grep" } |