Hello community, here is the log from the commit of package nagios-rpm-macros for openSUSE:Factory checked in at 2012-07-23 10:15:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.nagios-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios-rpm-macros", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios-rpm-macros/nagios-rpm-macros.changes 2012-02-22 15:53:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nagios-rpm-macros.new/nagios-rpm-macros.changes 2012-07-23 10:16:02.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 14:14:26 UTC 2012 - thard...@suse.com + +- added additional Icinga paths for Icinga 1.7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.i3ksWS/_old 2012-07-23 10:16:03.000000000 +0200 +++ /var/tmp/diff_new_pack.i3ksWS/_new 2012-07-23 10:16:03.000000000 +0200 @@ -16,12 +16,11 @@ # - Name: nagios-rpm-macros Summary: RPM Macros for Nagios based packages License: BSD-3-Clause Group: System/Monitoring -Version: 0.04 +Version: 0.05 Release: 0 Url: http://en.opensuse.org/Nagios Source0: macros.nagios ++++++ macros.icinga ++++++ --- /var/tmp/diff_new_pack.i3ksWS/_old 2012-07-23 10:16:03.000000000 +0200 +++ /var/tmp/diff_new_pack.i3ksWS/_new 2012-07-23 10:16:03.000000000 +0200 @@ -7,7 +7,7 @@ # # install all plugins into this directory -# Please note: we use the old Nagios directory here, as plugins are +# Please note: we use the old Nagios directory here, as plugins are # currently compatible %icinga_plugindir %{_prefix}/lib/nagios/plugins # install all event handler scripts into this directory @@ -20,31 +20,42 @@ %icinga_sysconfdir %{_sysconfdir}/icinga # Icinga static webpages, stylesheets and theme(s), online documentation %icinga_datadir %{_datadir}/icinga -# Icinga spool dir (checkresult-dir) +# Icinga spool dir %icinga_spooldir %{_var}/spool/icinga +# Icinga run dir +%icinga_rundir %{_localstatedir}/run/icinga # Icinga logfile dir %icinga_logdir %{_var}/log/icinga # Icinga cgi directory %icinga_cgidir %{_prefix}/lib/icinga/cgi +# Icinga cgi logging directory +%icinga_cgi_logdir %{icinga_logdir}/www +# Icinga check results spool directory +%icinga_checkresultdir %{icinga_spooldir}/checkresults +# Icinga external command file directory +%icinga_cmd_filedir %{icinga_rundir} # # files # -# This is the file that Icinga checks for external command requests -%icinga_command_file %{_var}/spool/icinga/icinga.cmd -# This is where the current status of all monitored services and -# hosts is stored. -%icinga_status_file %{_var}/lib/icinga/status.dat -# This is the file that Icinga should use to store host and -# service state information before it shuts down. -%icinga_state_retention_file %{_var}/lib/icinga/retention.dat # Icinga lock file -%icinga_lockfile %{_localstatedir}/run/icinga/icinga.pid +%icinga_lockfile %{icinga_rundir}/icinga.pid # Icinga ido2db lock file -%icinga_ido2db_lockfile %{_localstatedir}/run/icinga/ido2db.pid +%icinga_ido2db_lockfile %{icinga_rundir}/ido2db.pid +# Icinga external command file - the name icinga.cmd is static, only the +# directory is configurable +%icinga_cmdfile %{icinga_cmd_filedir}/icinga.cmd # Icinga ido2db socket file -%icinga_ido2db_socketfile %{icinga_spooldir}/ido2db.sock +%icinga_ido2db_socketfile %{icinga_rundir}/ido2db.sock +# Icinga initscript error file +%icinga_chkfile %{icinga_spooldir}/icinga.chk +# Icinga idomod tmp file +%icinga_idomod_tmpfile %{icinga_spooldir}/idomod.tmp +# Icinga HTTP auth file +%icinga_http_authfile %{icinga_sysconfdir}/htpasswd.users +#Icinga logrotate file +%icinga_logrotatefile %{_sysconfdir}/logrotate.d/icinga # # -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
