From: Stephen Gran <steve@lobefin.net>
Date: Sun, 7 Mar 2010 20:29:38 +0000 (+0000)
Subject: bandwidth graphs for v6
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4e2186720c0ae90c5032b68e1f8f7bccfe3ac908;p=mirror%2Fdsa-puppet.git

bandwidth graphs for v6

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 919833064..dbb3430a5 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -26,6 +26,7 @@ class debian-org {
         "cron": ensure => installed;
         "csh": ensure => installed;
         "dnsutils": ensure => installed;
+        "dsa-munin-checks": ensure => installed;
         "ed": ensure => installed;
         "gnupg": ensure => installed;
         "klogd": ensure => purged;
diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index a16e2c750..8ce448ec5 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -62,6 +62,16 @@ class ferm {
         $munin_ips: script => "ip_";
     }
 
+    case $v6ips {
+        'no': {}
+        default: {
+            $munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
+            activate_munin_check {
+                $munin6_ips: script => "ip6_";
+            }
+        }
+    }
+
     exec {
         "ferm restart":
             command     => "/etc/init.d/ferm restart",
diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index 82bdb0925..18c5e9c0d 100644
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,4 +1,5 @@
 def $MUNIN_IPS = (<%= v4ips.split(',').join(' ') %>);
+def $MUNIN6_IPS = (<%= v6ips.split(',').join(' ') %>);
 
 domain ip {
         chain INPUT {
@@ -11,3 +12,15 @@ domain ip {
                saddr ($MUNIN_IPS) NOP;
         }
 }
+
+domain ip6 {
+        chain INPUT {
+               daddr ($MUNIN6_IPS) NOP;
+        }
+}
+
+domain ip6 {
+        chain OUTPUT {
+               saddr ($MUNIN6_IPS) NOP;
+        }
+}