summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-06-27 15:41:57 -0400
committerMicah Anderson <micah@riseup.net>2012-06-27 15:41:57 -0400
commit0161b29068725dfde73e7416c1d745b7fe31b423 (patch)
tree4f3361fa992074f4d273b847b8bd231b8cbb77e5
parent368e5d4b90911ffb2d56eaa037520a5df4ef7390 (diff)
change site-munin to site_munin for 2.7
-rw-r--r--manifests/host.pp6
-rw-r--r--manifests/host/cgi.pp6
2 files changed, 6 insertions, 6 deletions
diff --git a/manifests/host.pp b/manifests/host.pp
index 9d30d6a..0d069e1 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -12,9 +12,9 @@ class munin::host inherits munin
File <<| tag == 'munin' |>>
file{'/etc/munin/munin.conf.header':
- source => [ "puppet:///modules/site-munin/config/host/${fqdn}/munin.conf.header",
- "puppet:///modules/site-munin/config/host/munin.conf.header.$operatingsystem",
- "puppet:///modules/site-munin/config/host/munin.conf.header",
+ source => [ "puppet:///modules/site_munin/config/host/${fqdn}/munin.conf.header",
+ "puppet:///modules/site_munin/config/host/munin.conf.header.$operatingsystem",
+ "puppet:///modules/site_munin/config/host/munin.conf.header",
"puppet:///modules/munin/config/host/munin.conf.header.$operatingsystem",
"puppet:///modules/munin/config/host/munin.conf.header" ],
notify => Exec['concat_/etc/munin/munin.conf'],
diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp
index cbf1052..13669ed 100644
--- a/manifests/host/cgi.pp
+++ b/manifests/host/cgi.pp
@@ -18,9 +18,9 @@ class munin::host::cgi inherits munin::host {
}
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",
+ 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;