refactor module to the new standard
authorMarcel Haerry <haerry@puzzle.ch>
Tue, 21 Sep 2010 15:25:49 +0000 (17:25 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Tue, 21 Sep 2010 15:25:49 +0000 (17:25 +0200)
manifests/client/openbsd.pp
manifests/host.pp
manifests/host/cgi.pp
manifests/plugin/deploy.pp
manifests/plugins/base.pp
manifests/snmp_collector.pp

index 17abdbf..4c2807c 100644 (file)
@@ -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', 
index 9251516..734eea6 100644 (file)
@@ -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;
     }
index 7fdb281..6fd50df 100644 (file)
@@ -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;
     }
 }
index 47bf796..eb4e3da 100644 (file)
@@ -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;
     }
 
index 1bfed48..80a957e 100644 (file)
@@ -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,
index 53a860f..60fd573 100644 (file)
@@ -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;
        }