rpms/ganglia/devel ganglia.spec,1.2,1.3

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/ganglia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18788

Modified Files:
	ganglia.spec 
Log Message:
- Both gmetad and gmond need to run as the ganglia user, but its quite often the case that only one or the other is installed on a system. Have both try to create the ganglia user -- if both try on the same system, the second should silently fail (bz #214762).




Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/ganglia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ganglia.spec	5 Sep 2006 14:06:36 -0000	1.2
+++ ganglia.spec	9 Nov 2006 19:05:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.0.3
-Release:            10%{?dist}
+Release:            11%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -132,11 +132,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+### Both gmetad and gmond require user ganglia, but monitored
+### nodes only need gmond, servers only need gmetad... So have
+### both packages try to add the user (second one should just
+### fail silently).
 %pre gmetad
 ## Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
+%pre gmond
+## Add the "ganglia" user
+/usr/sbin/useradd -c "Ganglia Monitoring System" \
+        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
+
 %post gmond
 /sbin/chkconfig --add gmond
 
@@ -197,6 +206,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Nov 09 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-11
+- gmond also needs ganglia user (#214762)
+
 * Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-10
 - Rebuild for new glibc