From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Wed, 1 Feb 2012 13:52:50 +0000 (+0100)
Subject: Fix munin error.
X-Git-Tag: debian/6.0.1~1
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;ds=sidebyside;h=fd6c20f705f1313feeb7dd5143d70f24fceb5c4c;hp=1f2da037f06adc5e03b674cc57389d0ee7b30072;p=carnet-upgrade.git

Fix munin error.
---

diff --git a/src/functions.sh b/src/functions.sh
index 94db9b0..f690377 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -952,8 +952,10 @@ upgrade_munin () {
   local config backup hostname domain
 
   # new htmldir location
-  mkdir -p /var/cache/munin
-  mv /var/www/munin /var/cache/munin/www
+  if [ -d /var/www/munin -a ! -e /var/cache/munin/www ]; then
+    mkdir -p /var/cache/munin
+    mv /var/www/munin /var/cache/munin/www
+  fi
 
   for pkg_name in munin munin-node; do
      pkg $pkg_name lt '1.4.5-3' || continue