diff options
| author | Micah Anderson <micah@riseup.net> | 2011-03-25 00:25:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-03-25 00:25:28 -0400 |
| commit | 4b0487fbea9e4fb828e618182215df0318b7ed1e (patch) | |
| tree | ebc06f3da869c9ffa83b5ea929e6ddfa82245c14 /manifests/host/cgi.pp | |
| parent | d4ca996f8e6d28d7c8f8ad2c922d6205c6b94dcb (diff) | |
| parent | 17df63f17e1aab4c15584b41fbe7fe925503e054 (diff) | |
Merge remote-tracking branch 'immerda/master'
Conflicts:
manifests/host.pp
manifests/host/cgi.pp
manifests/plugin.pp
manifests/plugin/deploy.pp
manifests/plugins/apache.pp
manifests/plugins/base.pp
manifests/plugins/dom0.pp
manifests/plugins/gentoo.pp
manifests/plugins/interfaces.pp
manifests/plugins/linux.pp
manifests/plugins/openbsd.pp
manifests/plugins/physical.pp
manifests/plugins/selinux.pp
manifests/plugins/vserver.pp
Diffstat (limited to 'manifests/host/cgi.pp')
| -rw-r--r-- | manifests/host/cgi.pp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp index 0cb3b32..cbf1052 100644 --- a/manifests/host/cgi.pp +++ b/manifests/host/cgi.pp @@ -16,14 +16,13 @@ class munin::host::cgi inherits munin::host { } } } - - file{ '/etc/logrotate.d/munin': - source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/logrotate", - "puppet://$server/modules/site-munin/config/host/logrotate.$operatingsystem", - "puppet://$server/modules/site-munin/config/host/logrotate", - "puppet://$server/modules/munin/config/host/logrotate.$operatingsystem", - "puppet://$server/modules/munin/config/host/logrotate" ], + + file{'/etc/logrotate.d/munin': + source => [ "puppet:///modules/site-munin/config/host/${fqdn}/logrotate", + "puppet:///modules/site-munin/config/host/logrotate.$operatingsystem", + "puppet:///modules/site-munin/config/host/logrotate", + "puppet:///modules/munin/config/host/logrotate.$operatingsystem", + "puppet:///modules/munin/config/host/logrotate" ], owner => root, group => 0, mode => 0644; } - } |