summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/client/openbsd.pp2
-rw-r--r--manifests/host.pp10
-rw-r--r--manifests/host/cgi.pp10
-rw-r--r--manifests/plugin/deploy.pp2
-rw-r--r--manifests/plugins/base.pp2
-rw-r--r--manifests/snmp_collector.pp2
6 files changed, 14 insertions, 14 deletions
diff --git a/manifests/client/openbsd.pp b/manifests/client/openbsd.pp
index 17abdbf..4c2807c 100644
--- a/manifests/client/openbsd.pp
+++ b/manifests/client/openbsd.pp
@@ -2,7 +2,7 @@
# :(
class munin::client::openbsd inherits munin::client::base {
file{'/usr/src/munin_openbsd.tar.gz':
- source => "puppet://$server/munin/openbsd/package/munin_openbsd.tar.gz",
+ source => "puppet:///modules/munin/openbsd/package/munin_openbsd.tar.gz",
owner => root, group => 0, mode => 0600;
}
package{ [ 'p5-Compress-Zlib', 'p5-Crypt-SSLeay', 'p5-HTML-Parser',
diff --git a/manifests/host.pp b/manifests/host.pp
index 9251516..734eea6 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -9,11 +9,11 @@ class munin::host
File <<| tag == 'munin' |>>
file{'/etc/munin/munin.conf.header':
- source => [ "puppet://$server/files/munin/config/host/${fqdn}/munin.conf.header",
- "puppet://$server/files/munin/config/host/munin.conf.header.$operatingsystem",
- "puppet://$server/files/munin/config/host/munin.conf.header",
- "puppet://$server/munin/config/host/munin.conf.header.$operatingsystem",
- "puppet://$server/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'],
owner => root, group => 0, mode => 0644;
}
diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp
index 7fdb281..6fd50df 100644
--- a/manifests/host/cgi.pp
+++ b/manifests/host/cgi.pp
@@ -6,11 +6,11 @@ class munin::host::cgi {
}
file{'/etc/logrotate.d/munin':
- source => [ "puppet://$server/files/munin/config/host/${fqdn}/logrotate",
- "puppet://$server/files/munin/config/host/logrotate.$operatingsystem",
- "puppet://$server/files/munin/config/host/logrotate",
- "puppet://$server/munin/config/host/logrotate.$operatingsystem",
- "puppet://$server/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;
}
}
diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp
index 47bf796..eb4e3da 100644
--- a/manifests/plugin/deploy.pp
+++ b/manifests/plugin/deploy.pp
@@ -11,7 +11,7 @@ define munin::plugin::deploy($source = '', $ensure = 'present', $config = '') {
include munin::plugin::scriptpaths
file { "munin_plugin_${name}":
path => "$munin::plugin::scriptpaths::script_path/${name}",
- source => "puppet://$server/$real_source",
+ source => "puppet:///$real_source",
mode => 0755, owner => root, group => 0;
}
diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp
index 1bfed48..80a957e 100644
--- a/manifests/plugins/base.pp
+++ b/manifests/plugins/base.pp
@@ -1,7 +1,7 @@
class munin::plugins::base {
file {
[ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
- source => "puppet://$server/common/empty",
+ source => "puppet:///modules/common/empty",
ignore => [ '\.ignore', 'snmp_*' ],
ensure => directory, checksum => mtime,
recurse => true, purge => true, force => true,
diff --git a/manifests/snmp_collector.pp b/manifests/snmp_collector.pp
index 53a860f..60fd573 100644
--- a/manifests/snmp_collector.pp
+++ b/manifests/snmp_collector.pp
@@ -1,7 +1,7 @@
class munin::snmp_collector{
file {
"/var/lib/puppet/modules/munin/create_snmp_links":
- source => "puppet://$server/munin/create_snmp_links.sh",
+ source => "puppet:///modules/munin/create_snmp_links.sh",
mode => 755, owner => root, group => 0;
}