Changes - j0ke.net Open Build Service

Difference Between Revision 7 and server:monitoring / icinga

[-] [+]	Changed	icinga.changes
@@ -1,29 +1,4 @@ ------------------------------------------------------------------- -Sat Feb 15 17:51:47 UTC 2014 - cs@linux-administrator.com - -- update to release 1.8.6 - -------------------------------------------------------------------- -Mon Jan 14 19:14:30 UTC 2013 - cs@linux-administrator.com - -- update to release 1.8.4 - -------------------------------------------------------------------- -Sun Dec 2 14:59:02 UTC 2012 - cs@linux-administrator.com - -- update to release 1.8.2 - -------------------------------------------------------------------- -Sat Nov 3 11:36:26 UTC 2012 - cs@linux-administrator.com - -- update to release 1.8.1 - -------------------------------------------------------------------- -Sun Oct 21 10:09:12 UTC 2012 - cs@linux-administrator.com - -- update to release 1.8.0 - -------------------------------------------------------------------- Tue Jun 19 08:24:47 UTC 2012 - cs@linux-administrator.com - update to release 1.7.1
[-] [+]	Changed	icinga.spec ^
@@ -1,7 +1,7 @@ #!BuildIgnore: post-build-checks %define name icinga -%define version 1.8.6 -%define pkgversion 1.8.6 +%define version 1.7.1 +%define pkgversion 1.7.1 %define release 1 %define nsusr icinga %define nsgrp icinga @@ -19,7 +19,6 @@ # Macro that print mesages to syslog at package (un)install time %define nnmmsg logger -t %{name}/rpm -Provides: monitoring_daemon Summary: Host/service/network monitoring program Name: %{name} @@ -223,7 +222,6 @@ --with-gd-inc=/usr/include \ --with-dbi-lib=%{_libdir} \ --with-dbi-inc=%{_includedir}/db \ - --with-libdbi-driver-dir=%{_libdir}/dbd \ --with-oci-lib=%{_libdir} \ --with-oci-inc=%{_includedir} \ --with-ssl-dir=%{_prefix} \ @@ -237,6 +235,13 @@ %__make all +# make sample configs +###cd sample-config +###F=`mktemp temp.XXXXXX` +###sed -e 's=/var/log/icinga/rw/=/var/spool/icinga/=;s=@sysconfdir@/resource.cfg=@sysconfdir@/private/resource.cfg=' icinga.cfg > ${F} +###mv ${F} icinga.cfg +###cd .. + # make daemonchk.cgi and event handlers cd contrib %__make @@ -250,7 +255,33 @@ done cd ../.. +#cd module/icinga-api +#./configure \ +# --host=%{arch}-suse-linux-gnu \ +# --build=%{arch}-suse-linux-gnu \ +# --target=%{arch}-suse-linux \ +# --prefix=%{_prefix} \ +# --exec-prefix=%{_prefix}/sbin \ +# --bindir=%{_prefix}/sbin \ +# --sbindir=%{_prefix}/lib/icinga/cgi \ +# --libexecdir=%{_prefix}/lib/icinga/plugins \ +# --datarootdir=%{_prefix}/share/icinga \ +# --datadir=%{_prefix}/share/icinga \ +# --mandir=%{_mandir} \ +# --docdir=%{_docdir}/%{name} \ +# --sysconfdir=/etc/icinga \ +# --localstatedir=/var/log/icinga \ +# --with-phpapi-log-dir=%{logdir}/api \ +# --with-icinga-user=%{nsusr} \ +# --with-icinga-group=%{nsgrp} \ +# --with-command-user=%{nsusr} \ +# --with-command-group=%{cmdgrp} \ +# --with-web-user=%{wwwusr} \ +# --with-web-group=%{wwwgrp} +#%__make all + %install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT install -d -m 0775 ${RPM_BUILD_ROOT}/var/spool/icinga install -d -m 0775 ${RPM_BUILD_ROOT}/var/spool/icinga/checkresults install -d -m 0755 ${RPM_BUILD_ROOT}%{_prefix}/include/icinga @@ -258,6 +289,7 @@ install -d -m 0755 ${RPM_BUILD_ROOT}/etc/logrotate.d install -d -m 0755 ${RPM_BUILD_ROOT}/etc/apache2/conf.d install -d -m 0755 ${RPM_BUILD_ROOT}/etc/icinga +### install -d -m 0755 ${RPM_BUILD_ROOT}/etc/icinga/private make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" INIT_OPTS="" install-daemoninit make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install-idoutils @@ -290,6 +322,8 @@ # install CGIs cd contrib make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" CGIDIR=%{_prefix}/lib/icinga/cgi install +#mv ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/cgi/convertcfg ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/ +#mv ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/cgi/mini_epn ${RPM_BUILD_ROOT}%{_prefix}/sbin/ cd .. # install event handlers @@ -300,6 +334,9 @@ done cd ../.. +#cd module/icinga-api +#make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install + install -d -m 0755 ${RPM_BUILD_ROOT}/var/log/icinga/rw chmod +x %{buildroot}/etc/init.d/ido2db @@ -322,6 +359,7 @@ %{_sbindir}/mini_epn %{_sbindir}/new_mini_epn %{_sbindir}/ido2db +#%{_sbindir}/idomod.o %{_sbindir}/log2ido %{_sbindir}/rcicinga %{_sbindir}/rcido2db @@ -337,7 +375,9 @@ %dir /etc/icinga/objects %config /etc/icinga/objects/ido2db_check_proc.cfg %defattr(750,root,%{nsgrp}) +###%dir /etc/icinga/private %defattr(640,root,%{nsgrp}) +### %config(noreplace) /etc/icinga/private/resource.cfg %defattr(755,%{nsusr},%{nsgrp}) %dir /var/log/icinga %dir /var/log/icinga/rw @@ -350,8 +390,6 @@ %doc module/idoutils/db/mysql/mysql.sql %doc module/idoutils/db/oracle/oracle.sql %doc module/idoutils/db/pgsql/pgsql.sql -%doc sample-config/updates/ -%doc module/idoutils/config/updates/ %defattr(-,%{nsusr},%{nsgrp}) %dir %{logdir} @@ -367,6 +405,7 @@ %dir %{logdir}/cgi %{logdir}/cgi/index.htm %{logdir}/cgi/.htaccess +##%dir %{logdir}/api %files devel %defattr(-,root,root) @@ -375,3 +414,40 @@ %changelog +* Thu Mar 31 2011 Carsten Schoene <cs@linux-administrator.com> - 1.3.1-1 +- update to release 1.3.1 + +* Wed Feb 16 2011 Carsten Schoene <cs@linux-administrator.com> - 1.3.0-1 +- update to release 1.3.0 + +* Sun Jan 30 2011 Carsten Schoene <cs@linux-administrator.com> - 1.2.1-3 +- added rcicinga & rcido2db links +- added /var/log/icinga/rw directory +- added initial ido2db sql definitions to docs + +* Mon Oct 25 2010 Carsten Schoene <cs@linux-administrator.com> - 1.2.1-1 +- update to release 1.2.1 + +* Wed Oct 06 2010 Carsten Schoene <cs@linux-administrator.com> - 1.2.0-1 +- update to release 1.2.0 + +* Wed Aug 18 2010 Carsten Schoene <cs@linux-administrator.com> - 1.0.3-1 +- update to release 1.0.3 + +* Wed Jun 30 2010 Carsten Schoene <cs@linux-administrator.com> - 1.0.2-1 +- update to release 1.0.2 + +* Thu Mar 04 2010 Carsten Schoene <cs@linux-administrator.com> - 1.0.1-1 +- update to release 1.0.1 + +* Mon Dec 21 2009 Carsten Schoene <cs@linux-administrator.com> - 1.0.0-1 +- update to release 1.0.0 + +* Sun Sep 27 2009 Carsten Schoene <cs@linux-administrator.com> - 0.8.4-1 +- update to release 0.8.4 + +* Thu Aug 13 2009 Carsten Schoene <cs@linux-administrator.com> - 0.8.2-1 +- update to release 0.8.2 + +* Sun Jul 19 2009 Carsten Schoene <cs@linux-administrator.com> - 0.8.1-1 +- initial icinga build
	Changed	icinga-1.7.1.tar.bz2 ^