diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
commit | 23201220bf8b7b63da44747be142face0c98eb09 (patch) | |
tree | c1645f62976281a552963b1309307e0d0b6136f3 /manifests/client/darwin.pp | |
parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
parent | eaa092eb1a8f3ae19551e6e80f84d174211b5208 (diff) |
Merge branch 'merge_immerda' into 'master'
This is my attempt at merging the huge backlog of commits from immerda. I've been pretty verbose about it in redmine so I won't repeat it all here. For details, see:
https://labs.riseup.net/code/issues/4132
Diffstat (limited to 'manifests/client/darwin.pp')
-rw-r--r-- | manifests/client/darwin.pp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/manifests/client/darwin.pp b/manifests/client/darwin.pp index 264263d..7639896 100644 --- a/manifests/client/darwin.pp +++ b/manifests/client/darwin.pp @@ -1,21 +1,22 @@ +# Install a munin client on darwin class munin::client::darwin { - file { "/usr/share/snmp/snmpd.conf": - mode => 744, - content => template("munin/darwin_snmpd.conf.erb"), - group => 0, - owner => root, + file { '/usr/share/snmp/snmpd.conf': + mode => '0744', + content => template('munin/darwin_snmpd.conf.erb'), + group => 0, + owner => root, } - line{"startsnmpdno": - file => "/etc/hostconfig", - line => "SNMPSERVER=-NO-", - ensure => 'absent', + line{'startsnmpdno': + ensure => absent, + file => '/etc/hostconfig', + line => 'SNMPSERVER=-NO-', } - line { "startsnmpdyes": - file => "/etc/hostconfig", - line => "SNMPSERVER=-YES-", - notify => Exec["/sbin/SystemStarter start SNMP"], + line { 'startsnmpdyes': + file => '/etc/hostconfig', + line => 'SNMPSERVER=-YES-', + notify => Exec['/sbin/SystemStarter start SNMP'], } - exec{"/sbin/SystemStarter start SNMP": + exec{'/sbin/SystemStarter start SNMP': noop => false, } munin::register::snmp { $::fqdn: } |