diff options
author | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
commit | 5218993abef2a8bf79278d4d84123843279735c5 (patch) | |
tree | 8fe859ba86b83e4b9782ac19a37c89bf5cf5f0ba /manifests/snmp_collector.pp | |
parent | b3e29447187e289c60a4a9f7830032f1b10fae2f (diff) | |
parent | e7d23dabf191c5416197af0b229fc90b94539405 (diff) |
Merge commit 'e7d23dabf191c5416197af0b229fc90b94539405'
Conflicts:
manifests/client.pp
manifests/client/base.pp
manifests/client/darwin.pp
manifests/client/debian.pp
manifests/client/gentoo.pp
manifests/client/openbsd.pp
manifests/client/package.pp
manifests/host.pp
manifests/init.pp
manifests/plugin.pp
manifests/plugin/scriptpaths.pp
manifests/plugins/interfaces.pp
manifests/plugins/linux.pp
manifests/plugins/vserver.pp
manifests/register.pp
manifests/register_snmp.pp
manifests/remoteplugin.pp
manifests/snmp_collector.pp
Diffstat (limited to 'manifests/snmp_collector.pp')
-rw-r--r-- | manifests/snmp_collector.pp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/manifests/snmp_collector.pp b/manifests/snmp_collector.pp index 3b60541..6f3fe34 100644 --- a/manifests/snmp_collector.pp +++ b/manifests/snmp_collector.pp @@ -1,14 +1,14 @@ -class munin::snmp_collector { +class munin::snmp_collector{ + file { + "/var/lib/puppet/modules/munin/create_snmp_links": + source => "puppet://$server/modules/munin/create_snmp_links.sh", + mode => 755, owner => root, group => 0; + } - file { "/var/lib/puppet/modules/munin/create_snmp_links": - source => "puppet://$server/modules/munin/create_snmp_links.sh", - mode => 755, owner => root, group => 0; - } - - exec { "create_snmp_links": - command => "/var/lib/puppet/modules/munin/create_snmp_links /var/lib/puppet/modules/munin/nodes", - require => File["snmp_links"], - timeout => "2048", - schedule => daily - } + exec { "create_snmp_links": + command => "/var/lib/puppet/modules/munin/create_snmp_links /var/lib/puppet/modules/munin/nodes", + require => File["snmp_links"], + timeout => "2048", + schedule => daily + } } |