[D-community-commits] r372 - in trunk/fai-config-dir/scripts: . DEFAULT LAST MAILSERVER WEBSERVER

[holger at alioth.debian.org]

Author: holger
Date: 2008-11-14 16:17:08 +0000 (Fri, 14 Nov 2008)
New Revision: 372

Added:
   trunk/fai-config-dir/scripts/LAST/
   trunk/fai-config-dir/scripts/LAST/10-munin-node
Modified:
   trunk/fai-config-dir/scripts/DEFAULT/31-munin-node
   trunk/fai-config-dir/scripts/MAILSERVER/40-munin-node
   trunk/fai-config-dir/scripts/WEBSERVER/50-munin-node
Log:
refactor code to deploy munin

Modified: trunk/fai-config-dir/scripts/DEFAULT/31-munin-node
===================================================================
--- trunk/fai-config-dir/scripts/DEFAULT/31-munin-node	2008-11-14 16:12:22 UTC (rev 371)
+++ trunk/fai-config-dir/scripts/DEFAULT/31-munin-node	2008-11-14 16:17:08 UTC (rev 372)
@@ -5,10 +5,6 @@
 #        GPL2 licenced
 #
 
-# deploy custom plugins
-fcopy -r -m root,root,0755 /usr/share/munin/plugins/
-fcopy -r /etc/munin/
-
 # remove unwanted plugins
 for i in exim_mailqueue exim_mailstats ; do 
     $ROOTCMD rm -f /etc/munin/plugins/$i
@@ -24,6 +20,4 @@
   $ROOTCMD ln -s /usr/share/munin/plugins/ipmi_sensor_ /etc/munin/plugins/ipmi_sensor_$i 
 done
 
-# restart munin-node
-$ROOTCMD /etc/init.d/munin-node restart
 

Added: trunk/fai-config-dir/scripts/LAST/10-munin-node
===================================================================
--- trunk/fai-config-dir/scripts/LAST/10-munin-node	                        (rev 0)
+++ trunk/fai-config-dir/scripts/LAST/10-munin-node	2008-11-14 16:17:08 UTC (rev 372)
@@ -0,0 +1,13 @@
+#! /bin/bash
+
+#
+#        (c) 2008 Holger Levsen         holger at layer-acht.org
+#        GPL2 licenced
+#
+
+# munin-node is installed by DEFAULT
+fcopy -r -m root,root,0755 /usr/share/munin/plugins/
+fcopy -M -r /etc/munin/
+$ROOTCMD /etc/init.d/munin-node restart
+
+


Property changes on: trunk/fai-config-dir/scripts/LAST/10-munin-node
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/fai-config-dir/scripts/MAILSERVER/40-munin-node
===================================================================
--- trunk/fai-config-dir/scripts/MAILSERVER/40-munin-node	2008-11-14 16:12:22 UTC (rev 371)
+++ trunk/fai-config-dir/scripts/MAILSERVER/40-munin-node	2008-11-14 16:17:08 UTC (rev 372)
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 #
-#        (c) 2007 Holger Levsen         holger at layer-acht.org
+#        (c) 2007, 2008 Holger Levsen         holger at layer-acht.org
 #        GPL2 licenced
 #
 
@@ -9,6 +9,5 @@
 for i in postfix_mailqueue postfix_mailstats postfix_mailvolume ; do 
   $ROOTCMD ln -s /usr/share/munin/plugins/$i /etc/munin/plugins/$i
 done
-$ROOTCMD /etc/init.d/munin-node restart
 
 

Modified: trunk/fai-config-dir/scripts/WEBSERVER/50-munin-node
===================================================================
--- trunk/fai-config-dir/scripts/WEBSERVER/50-munin-node	2008-11-14 16:12:22 UTC (rev 371)
+++ trunk/fai-config-dir/scripts/WEBSERVER/50-munin-node	2008-11-14 16:17:08 UTC (rev 372)
@@ -10,7 +10,3 @@
   $ROOTCMD ln -s /usr/share/munin/plugins/$i /etc/munin/plugins/$i
 done
 
-# restart munin-node
-$ROOTCMD /etc/init.d/munin-node restart
-
-