From 12c5c1055815eca712cb6dc36e258dce2599b72f Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Fri, 12 May 2017 20:46:53 -0300
Subject: Updated gangalia

---
 pcr/ganglia/ganglia.install | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'pcr/ganglia/ganglia.install')

diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
index 6a196af1f..20620db24 100644
--- a/pcr/ganglia/ganglia.install
+++ b/pcr/ganglia/ganglia.install
@@ -1,24 +1,27 @@
+# Arg 1: the new package version
 post_install() {
-  if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
-    echo 'WARNING: The ganglia package has been split. If you use the' \
-         "web frontend, you'll need to install the ganglia-web package as well."
-  fi
-  id ganglia  >& /dev/null
-  if [ $? -ne 0 ]; then
-     echo 'Adding ganglia system group and user...'
-     groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
-     # Lock the account to prevent logging in
-     passwd -l ganglia &> /dev/null
-  fi
-  install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
+
+  # Create user and group
+  systemd-sysusers ganglia.conf
+
+  # Required at this stage to ensure ganglia user & group are available
+  install -d -o ganglia -g ganglia /var/lib/ganglia{,/rrds}
 }
 
+# Arg 1: the new package version
+# Arg 2: the old package version
 post_upgrade() {
-  post_install
+  if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
+    echo "WARNING: The ganglia package has been split. If you use the" \
+         "web frontend, you'll need to install the ganglia-web package as well."
+  fi
 }
 
+# Arg 1: the old package version
 post_remove() {
-  echo 'Removing ganglia system group and user...'
-  userdel ganglia
-  echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.'
+  echo "This package does not automatically remove the ganglia data "
+  echo "directory (default /var/lib/ganglia) or ganglia user. Please do so "
+  echo "manually if they are no longer required."
 }
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3