X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=acc4dad7f6773db986db36c3d8fc23c7603944b1;hb=f917af08133389103ba492323f53aa02056ad84f;hp=4a37c256706fd90159890271da033a057fd7aaf0;hpb=8c37a487ea35a7fb3ed001c694019e0f3b1def48;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 4a37c25..acc4dad 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -823,9 +823,19 @@ disable_monit () {
     apt-get remove --yes monit
     # stop the binary
     pkill -9 monit || true
+    # move away init for insserv to work
+    mv /etc/init.d/monit /var/lib/carnet-upgrade/
   fi
 }
 
+# allow monit to run again
+enable_monit () {
+  if [ -f /var/lib/carnet-upgrade/monit ]; then
+    mv /var/lib/carnet-upgrade/monit /etc/init.d/monit
+    pkgadd monit-cn
+  fi 
+}
+
 # check which of the given packages are installed
 grep_installed () {
   local package installed
@@ -950,6 +960,10 @@ get_variable () {
 upgrade_munin () {
   local config backup hostname domain
 
+  # new htmldir location
+  mkdir -p /var/cache/munin
+  mv /var/www/munin /var/cache/munin/www
+
   for pkg_name in munin munin-node; do
      pkg $pkg_name lt '1.4.5-3' || continue