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/defaults/templates.pp | |
| 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/defaults/templates.pp')
| -rw-r--r-- | manifests/defaults/templates.pp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index c97eee4..0e73c97 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -1,15 +1,15 @@ class nagios::defaults::templates { - include nagios::defaults::vars + include nagios::defaults::vars - file { 'nagios_templates': - path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_templates.cfg", - source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios_templates.cfg", - "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg", - "puppet:///modules/site-nagios/configs/nagios_templates.cfg", - "puppet:///modules/nagios/configs/${operatingsystem}/nagios_templates.cfg", - "puppet:///modules/nagios/configs/nagios_templates.cfg" ], - notify => Service['nagios'], - mode => 0644, owner => root, group => root; - } + file { 'nagios_templates': + path => "${nagios::defaults::vars::int_cfgdir}/conf.d/nagios_templates.cfg", + source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/nagios_templates.cfg", + "puppet:///modules/site_nagios/configs/${::operatingsystem}/nagios_templates.cfg", + "puppet:///modules/site_nagios/configs/nagios_templates.cfg", + "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg", + "puppet:///modules/nagios/configs/nagios_templates.cfg" ], + notify => Service['nagios'], + mode => 0644, owner => root, group => root; + } } |