Merge lp:~jontai/openvista-gtm-integration/bug542436 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

review: Approve

=== modified file 'scripts/usr/sbin/ovinstanceadd'
--- scripts/usr/sbin/ovinstanceadd	2010-02-11 18:50:29 +0000
+++ scripts/usr/sbin/ovinstanceadd	2010-03-20 06:00:40 +0000
@@ -276,5 +276,18 @@
 htpasswd -b -m "$apache_conf/webdav.htpasswd" "$instance" "`cat \"$root/$instance/etc/$instance-webdav_password\"`" > /dev/null 2>&1 || 
 exit_with_error "ovinstanceadd" "Unable to update $apache_conf/webdav.htpasswd"
 
+for plugin in openvista_databases openvista_locks openvista_processes; do
+    if [ -f /usr/share/munin/plugins/${plugin}_ ] && [ -d /etc/munin/plugins ]; then
+        ln -s /usr/share/munin/plugins/${plugin}_ "/etc/munin/plugins/${plugin}_$instance" ||
+        exit_with_error "ovinstanceadd" "Unable to install $plugin munin plugin"
+    fi
+done
+
+if [ -x /etc/init.d/munin-node ]; then
+    if /etc/init.d/munin-node status > /dev/null 2>&1; then
+        /etc/init.d/munin-node restart > /dev/null 2>&1
+    fi
+fi
+
 print_status "ovinstanceadd" "Created $instance" "true"
 

=== modified file 'scripts/usr/sbin/ovinstancedel'
--- scripts/usr/sbin/ovinstancedel	2010-02-11 18:50:29 +0000
+++ scripts/usr/sbin/ovinstancedel	2010-03-20 06:00:40 +0000
@@ -172,5 +172,18 @@
 rm -rf "$docroot/webdav/$instance" || 
 exit_with_error "ovinstancedel" "Unable to remove WebDAV root"
 
+for plugin in openvista_databases openvista_locks openvista_processes; do
+    if [ -L "/etc/munin/plugins/${plugin}_$instance" ]; then
+        rm -f "/etc/munin/plugins/${plugin}_$instance" ||
+        exit_with_error "ovinstancedel" "Unable to remove $plugin munin plugin"
+    fi
+done
+
+if [ -x /etc/init.d/munin-node ]; then
+    if /etc/init.d/munin-node status > /dev/null 2>&1; then
+        /etc/init.d/munin-node restart > /dev/null 2>&1
+    fi
+fi
+
 print_status "ovinstancedel" "Deleted $instance" "true"