Author: glen Date: Tue Dec 7 15:38:11 2010 GMT Module: packages Tag: HEAD ---- Log message: - fixup paths in apps
---- Files affected: packages/nagios-merlin: nagios-merlin.spec (1.8 -> 1.9) ---- Diffs: ================================================================ Index: packages/nagios-merlin/nagios-merlin.spec diff -u packages/nagios-merlin/nagios-merlin.spec:1.8 packages/nagios-merlin/nagios-merlin.spec:1.9 --- packages/nagios-merlin/nagios-merlin.spec:1.8 Tue Dec 7 16:15:55 2010 +++ packages/nagios-merlin/nagios-merlin.spec Tue Dec 7 16:38:06 2010 @@ -2,7 +2,7 @@ Summary: Merlin: Module for Effortless Redundancy and Loadbalancing In Nagios Name: nagios-merlin Version: 0.9.0 -Release: 0.15 +Release: 0.20 License: GPL v2 Group: Networking Source0: http://www.op5.org/op5media/op5.org/downloads/merlin-%{version}.tar.gz @@ -44,12 +44,33 @@ %patch0 -p1 %patch1 -p1 +find -type f | xargs \ %{__sed} -i -e ' s#@@DESTDIR@@/logs/neb.log#%{logdir}/merlin-neb.log#g s#@@DESTDIR@@/logs/daemon.log#%{logdir}/merlind.log#g s#@@DESTDIR@@/ipc.sock#%{sockdir}/ipc.sock#g s#/var/run/merlin.pid#/var/run/merlind.pid# -' example.conf + + # fix paths in "apps" + # we cant just replace whole path, as the targets differ + # sort -r the block when done adding + s#/opt/monitor/var/status.log#/var/lib/nagios/status.dat# + s#/opt/monitor/var/rw/#/var/lib/nagios/rw/# + s#/opt/monitor/var/objects.cache#/var/lib/nagios/objects.cache# + s#/opt/monitor/var/nagios.log#%{logdir}/nagios.log# + s#/opt/monitor/var/conf_sync.log#%{logdir}/conf_sync.log# + s#/opt/monitor/var/archives#%{logdir}/archives# + s#/opt/monitor/pushed_logs#/var/log/merlin/pushed_logs# + s#/opt/monitor/op5/merlin/merlin.conf#%{_sysconfdir}/merlin.conf# + s#/opt/monitor/op5/merlin/logs/#/var/log/merlin/# + s#/opt/monitor/op5/merlin#%{appdir}# + s#/opt/monitor/etc/nagios.cfg#%{_sysconfdir}/nagios.cfg#g + s#/opt/monitor/etc/#%{_sysconfdir}/#g + s#/opt/monitor/bin/nagios#%{_sbindir}/nagios#g + s#/etc/op5/distributed/state/#/var/lib/nagios/merlin/state/# + s#/etc/init.d/#/etc/rc.d/init.d/# + s#/usr/libexec/merlin#%{appdir}/lib# +' cp -a %{SOURCE2} README.PLD @@ -134,6 +155,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2010/12/07 15:38:06 glen +- fixup paths in apps + Revision 1.8 2010/12/07 15:15:55 glen - install apps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-merlin/nagios-merlin.spec?r1=1.8&r2=1.9&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
