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/snmp_collector.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/snmp_collector.pp')
| -rw-r--r-- | manifests/snmp_collector.pp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/manifests/snmp_collector.pp b/manifests/snmp_collector.pp index 0f8318a..4ff3bf9 100644 --- a/manifests/snmp_collector.pp +++ b/manifests/snmp_collector.pp @@ -1,14 +1,17 @@ +# Set up munin as an SNMP collector class munin::snmp_collector{ - file { - "/var/lib/puppet/modules/munin/create_snmp_links": - source => "puppet:///modules/munin/create_snmp_links.sh", - mode => 755, owner => root, group => 0; - } + file { + '/var/lib/puppet/modules/munin/create_snmp_links': + source => 'puppet:///modules/munin/create_snmp_links.sh', + mode => '0755', + 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, } } |