diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
commit | 8f7c0071eb82591477876eeb3f309067853a3261 (patch) | |
tree | b095f01b960b7ba3699da2dfa4d84cd5bb8a6361 /manifests/client/darwin.pp | |
parent | ea31faee76141646c173d88bd5bec5aa4a773c1c (diff) | |
parent | a5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff) |
Merge branch 'master' into leap
Conflicts:
README
manifests/host/cgi.pp
Diffstat (limited to 'manifests/client/darwin.pp')
-rw-r--r-- | manifests/client/darwin.pp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/manifests/client/darwin.pp b/manifests/client/darwin.pp index 9cfe7e9..264263d 100644 --- a/manifests/client/darwin.pp +++ b/manifests/client/darwin.pp @@ -1,22 +1,22 @@ class munin::client::darwin { - - file { "/usr/share/snmp/snmpd.conf": - mode => 744, - content => template("munin/darwin_snmpd.conf.erb"), - group => 0, - owner => root, - } - delete_matching_line{"startsnmpdno": - file => "/etc/hostconfig", - pattern => "SNMPSERVER=-NO-", - } - line { "startsnmpdyes": - file => "/etc/hostconfig", - line => "SNMPSERVER=-YES-", - notify => Exec["/sbin/SystemStarter start SNMP"], - } - exec{"/sbin/SystemStarter start SNMP": - noop => false, - } - munin::register_snmp { $fqdn: } + file { "/usr/share/snmp/snmpd.conf": + mode => 744, + content => template("munin/darwin_snmpd.conf.erb"), + group => 0, + owner => root, + } + line{"startsnmpdno": + file => "/etc/hostconfig", + line => "SNMPSERVER=-NO-", + ensure => 'absent', + } + line { "startsnmpdyes": + file => "/etc/hostconfig", + line => "SNMPSERVER=-YES-", + notify => Exec["/sbin/SystemStarter start SNMP"], + } + exec{"/sbin/SystemStarter start SNMP": + noop => false, + } + munin::register::snmp { $::fqdn: } } |