[arch-commits] Commit in munin/trunk (PKGBUILD munin-node.install munin.install)

[Dan McGee]

    Date: Saturday, April 23, 2011 @ 15:04:29
  Author: dan
Revision: 120398

upgpkg: munin 1.4.5-4
Fix FS#23802

Modified:
  munin/trunk/PKGBUILD
  munin/trunk/munin-node.install
  munin/trunk/munin.install

--------------------+
 PKGBUILD           |    2 +-
 munin-node.install |   10 ++++++++--
 munin.install      |    6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-23 18:41:15 UTC (rev 120397)
+++ PKGBUILD	2011-04-23 19:04:29 UTC (rev 120398)
@@ -5,7 +5,7 @@
 pkgname=('munin' 'munin-node')
 pkgbase=munin
 pkgver=1.4.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A distributed monitoring/graphing tool"
 arch=('any')
 url="http://munin-monitoring.org/"

Modified: munin-node.install
===================================================================
--- munin-node.install	2011-04-23 18:41:15 UTC (rev 120397)
+++ munin-node.install	2011-04-23 19:04:29 UTC (rev 120398)
@@ -3,9 +3,15 @@
   getent group munin >/dev/null || groupadd --system munin
   getent passwd munin >/dev/null || \
 	  useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin
-  # Fix permissions
-  chown munin.munin -R /var/log/munin /var/lib/munin
   # Do basic configuration
   echo "==> Run the following to get a good set of default plugins:"
   echo "    /usr/sbin/munin-node-configure --shell | sh"
+  post_upgrade
 }
+
+post_upgrade() {
+  # Ensure directories exist
+  mkdir -p /var/{lib,lock,log}/munin
+  # Fix permissions on necessary directories
+  chown munin.munin -R /var/{lib,lock,log}/munin
+}

Modified: munin.install
===================================================================
--- munin.install	2011-04-23 18:41:15 UTC (rev 120397)
+++ munin.install	2011-04-23 19:04:29 UTC (rev 120398)
@@ -3,8 +3,6 @@
   getent group munin >/dev/null || groupadd --system munin
   getent passwd munin >/dev/null || \
 	  useradd --system -c "Munin system monitor" -g munin -s /bin/false -d /var/lib/munin munin
-  # Fix permissions
-  chown munin.munin -R /var/log/munin /var/lib/munin
   # Display cron command
   echo "See the example cron entry (for the munin user) for further setup:
     /etc/munin/munin-cron-entry"
@@ -12,6 +10,10 @@
 }
 
 post_upgrade() {
+  # Ensure directories exist
+  mkdir -p /var/{lib,lock,log}/munin
+  # Fix permissions on necessary directories
+  chown munin.munin -R /var/{lib,lock,log}/munin
   fc-cache -fs
 }