Author: glen Date: Tue Sep 28 05:39:07 2010 GMT Module: packages Tag: HEAD ---- Log message: - 3.1.7, totally untested
---- Files affected: packages/ganglia: ganglia.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/ganglia/ganglia.spec diff -u packages/ganglia/ganglia.spec:1.2 packages/ganglia/ganglia.spec:1.3 --- packages/ganglia/ganglia.spec:1.2 Mon Nov 10 10:19:04 2008 +++ packages/ganglia/ganglia.spec Tue Sep 28 07:39:02 2010 @@ -1,13 +1,17 @@ # $Revision$, $Date$ +# TODO +# - unpackaged +# /etc/conf.d/modpython.conf +# /etc/gmetad.conf Summary: Ganglia Distributed Monitoring System Name: ganglia -Version: 3.1.1 -Release: 0.2 +Version: 3.1.7 +Release: 0.1 License: BSD Group: Applications/Networking -URL: http://ganglia.info/ +URL: http://www.ganglia.info/ Source0: http://dl.sourceforge.net/ganglia/%{name}-%{version}.tar.gz -# Source0-md5: e6f4de42afecb4731a5de4606e3f1045 +# Source0-md5: 6aa5e2109c2cc8007a6def0799cf1b4c Source1: %{name}-gmond.init Source2: %{name}-gmetad.init Patch0: %{name}-diskusage-fix.patch @@ -104,6 +108,20 @@ ## Hey, those shouldn't be executable... chmod -x lib/*.{h,x} +cat << 'EOF' > apache.conf +# +# Ganglia monitoring system PHP web frontend +# + +Alias /%{name} %{_datadir}/%{name} +<Location /%{name}> + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from ::1 + # Allow from .example.com +</Location> +EOF %build %configure \ @@ -130,27 +148,13 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name} install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} cp -a web/* $RPM_BUILD_ROOT%{_datadir}/%{name} -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php ln -s ../../..%{_sysconfdir}/%{name}/conf.php \ $RPM_BUILD_ROOT%{_datadir}/%{name}/conf.php -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/private_clusters $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/private_clusters $RPM_BUILD_ROOT%{_sysconfdir}/%{name} ln -s ../../..%{_sysconfdir}/%{name}/private_clusters \ $RPM_BUILD_ROOT%{_datadir}/%{name}/private_clusters install -d $RPM_BUILD_ROOT%{_webapps}/%{_webapp} -cat << 'EOF' > apache.conf -# -# Ganglia monitoring system php web frontend -# - -Alias /%{name} %{_datadir}/%{name} -<Location /%{name}> - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from ::1 - # Allow from .example.com -</Location> -EOF cp -a apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf cp -a apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf @@ -165,16 +169,16 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/gmond install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gmetad cp -p gmond/gmond.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5/gmond.conf.5 -cp -p gmetad/gmetad.conf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmetad.conf -cp -p mans/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ +cp -p gmetad/gmetad.conf.in $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmetad.conf +cp -p mans/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 ## Build default gmond.conf from gmond using the '-t' flag gmond/gmond -t | %{__perl} -pe 's|nobody|ganglia|g' > $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmond.conf ## Python bits # Copy the python metric modules and .conf files -cp -p gmond/python_modules/conf.d/*.pyconf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/ -cp -p gmond/modules/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/ -cp -p gmond/python_modules/*/*.{py,pyc} $RPM_BUILD_ROOT%{_libdir}/ganglia/python_modules/ +cp -p gmond/python_modules/conf.d/*.pyconf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d +cp -p gmond/modules/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d +cp -p gmond/python_modules/*/*.py $RPM_BUILD_ROOT%{_libdir}/ganglia/python_modules # Don't install the example modules rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/example.conf rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/example.pyconf @@ -196,10 +200,9 @@ rm -rf $RPM_BUILD_ROOT %pre -## Add the "ganglia" user +/sbin/ldconfig %groupadd -g 206 ganglia %useradd -u 206 -c "Ganglia Monitoring System" -s /sbin/nologin -g ganglia -r -d %{_localstatedir}/lib/%{name} ganglia -/sbin/ldconfig %post -p /sbin/ldconfig @@ -221,8 +224,8 @@ /sbin/chkconfig --del gmond fi -%post devel -p /sbin/ldconfig -%postun devel -p /sbin/ldconfig +%post devel -p /sbin/ldconfig +%postun devel -p /sbin/ldconfig %triggerin web -- apache1 < 1.3.37-3, apache1-base %webapp_register apache %{_webapp} @@ -239,7 +242,8 @@ %files %defattr(644,root,root,755) %doc AUTHORS COPYING NEWS README ChangeLog -%attr(755,root,root) %{_libdir}/libganglia*.so.* +%attr(755,root,root) %{_libdir}/libganglia-%{version}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libganglia-%{version}.so.0 %dir %{_libdir}/ganglia %{_libdir}/ganglia/*.so %exclude %{_libdir}/ganglia/modpython.so @@ -272,7 +276,7 @@ %files gmond-python %defattr(644,root,root,755) -%dir %{_libdir}/ganglia/python_modules/ +%dir %{_libdir}/ganglia/python_modules %{_libdir}/ganglia/python_modules/*.py* %attr(755,root,root) %{_libdir}/ganglia/modpython.so* %config(noreplace) %{_sysconfdir}/ganglia/conf.d/*.pyconf* @@ -282,7 +286,7 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/ganglia-config %{_includedir}/*.h -%{_libdir}/libganglia*.so +%{_libdir}/libganglia.so %files web %defattr(644,root,root,755) @@ -300,6 +304,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/09/28 05:39:02 glen +- 3.1.7, totally untested + Revision 1.2 2008/11/10 09:19:04 glen - pld initscripts - ganglia-config moved to -devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ganglia/ganglia.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
