From 4591a91f7a8b169d0aa3ccb46357c60f8dcb7079 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Thu, 13 May 2010 14:12:07 -0400
Subject: remove tabs and trailing whitespaces in manifests

---
 manifests/plugins/interfaces.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests/plugins/interfaces.pp')

diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
index 99b85ba..df0828c 100644
--- a/manifests/plugins/interfaces.pp
+++ b/manifests/plugins/interfaces.pp
@@ -8,14 +8,14 @@ class munin::plugins::interfaces inherits munin::plugins::base {
     case $operatingsystem {
         openbsd: {
             $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
-    	      munin::plugin{
+              munin::plugin{
             $if_errs: ensure => "if_errcoll_";
           }
         }
         default: {
             $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1")
-    	      munin::plugin{
-    	        $if_errs: ensure => "if_err_";
+              munin::plugin{
+                $if_errs: ensure => "if_err_";
           }
         }
     }
-- 
cgit v1.2.3


From dab730ed6b0667d4356c0e8e21e37719ea977a93 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 15 Jul 2010 20:41:39 +0200
Subject: fixing weird class setup

we had some weird class setup which caused some problems on 2.6
(see puppet bug #4242 for more info). This commit cleans that
weird setup up and decouples a lot of things.
---
 manifests/plugins/interfaces.pp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'manifests/plugins/interfaces.pp')

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


From 17df63f17e1aab4c15584b41fbe7fe925503e054 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 9 Dec 2010 23:32:53 +0100
Subject: replace gsub with builtin regsubst

---
 manifests/plugins/interfaces.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'manifests/plugins/interfaces.pp')

diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
index e0744a0..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  { 
 
-  $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1")
+  $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_";
       }
-- 
cgit v1.2.3