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

1 files changed, 8 insertions, 8 deletions

diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
index 03ed0e7..18a713b 100644
--- a/manifests/plugins/interfaces.pp
+++ b/manifests/plugins/interfaces.pp
@@ -1,19 +1,19 @@
 # handle if_ and if_err_ plugins
-class munin::plugins::interfaces inherits munin::plugins::base {
-  
-  $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1")
-  
-  munin::plugin { $ifs: ensure => "if_"; }
-  
+class munin::plugins::interfaces  { 
+
+  $ifs = regsubst(split($interfaces, " |,"), "(.+)", "if_\\1")
+  munin::plugin {
+    $ifs: ensure => "if_";
+  }
   case $operatingsystem {
     openbsd: {
-      $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
+      $if_errs = regsubst(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
       munin::plugin{
         $if_errs: ensure => "if_errcoll_";
       }
     }
     default: {
-      $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1")
+      $if_errs = regsubst(split($interfaces, " |,"), "(.+)", "if_err_\\1")
       munin::plugin{
         $if_errs: ensure => "if_err_";
       }