diff options
| author | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-09-25 16:27:37 -0400 |
| commit | 16e77b3a8b257dafcf059bfcebc095178995fda5 (patch) | |
| tree | 2673fa226de03b0be14ceef4df64140372643ea6 /manifests/nsca | |
| parent | ad1f714b06faf229ec1b0f310e81c425a6906581 (diff) | |
| parent | eafb4c73ee82915bf83eac01bb26265c531a68e2 (diff) | |
Merge branch 'merge_immerda'
Conflicts:
manifests/apache.pp
this conflict was just a indentation difference.
Diffstat (limited to 'manifests/nsca')
| -rw-r--r-- | manifests/nsca/client.pp | 6 | ||||
| -rw-r--r-- | manifests/nsca/server.pp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/manifests/nsca/client.pp b/manifests/nsca/client.pp index 6e2c472..e58721d 100644 --- a/manifests/nsca/client.pp +++ b/manifests/nsca/client.pp @@ -1,10 +1,10 @@ class nagios::nsca::client { package { 'nsca': ensure => installed } - + file { '/etc/send_nsca.cfg': - source => [ "puppet:///modules/site-nagios/nsca/{$fqdn}/send_nsca.cfg", - "puppet:///modules/site-nagios/nsca/send_nsca.cfg", + source => [ "puppet:///modules/site_nagios/nsca/{$::fqdn}/send_nsca.cfg", + "puppet:///modules/site_nagios/nsca/send_nsca.cfg", "puppet:///modules/nagios/nsca/send_nsca.cfg" ], owner => 'nagios', group => 'nogroup', diff --git a/manifests/nsca/server.pp b/manifests/nsca/server.pp index 238e49e..bd5389d 100644 --- a/manifests/nsca/server.pp +++ b/manifests/nsca/server.pp @@ -10,8 +10,8 @@ class nagios::nsca::server { } file { '/etc/nsca.cfg': - source => [ "puppet:///modules/site-nagios/nsca/{$fqdn}/nsca.cfg", - "puppet:///modules/site-nagios/nsca/nsca.cfg", + source => [ "puppet:///modules/site_nagios/nsca/{$::fqdn}/nsca.cfg", + "puppet:///modules/site_nagios/nsca/nsca.cfg", "puppet:///modules/nagios/nsca/nsca.cfg" ], owner => 'nagios', group => 'nogroup', |