diff --git a/icinga.changes b/icinga.changes index 2e230bc..29b7187 100644 --- a/icinga.changes +++ b/icinga.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 26 13:43:22 UTC 2015 - thardeck@suse.com + +- prevent changing of tmp_path permissions (bnc#923928) +- update to upstream version 1.13.2 + * Bug #9010: icinga.spec: broken path to downtimes scripts and not packaged config files + ------------------------------------------------------------------- Tue Apr 7 15:29:47 UTC 2015 - thardeck@suse.com diff --git a/icinga.spec b/icinga.spec index 062e283..2059a12 100644 --- a/icinga.spec +++ b/icinga.spec @@ -23,7 +23,7 @@ %endif Name: icinga -Version: 1.13.1 +Version: 1.13.2 Release: 0 Summary: Host/service/network monitoring program @@ -405,12 +405,6 @@ mv "%{buildroot}%{icinga_sysconfdir}/ido2db.cfg-sample" "%{buildroot}%{icinga_sy mv "%{buildroot}%{icinga_sysconfdir}/idomod.cfg-sample" "%{buildroot}%{icinga_sysconfdir}/idomod.cfg" mv "%{buildroot}%{icinga_sysconfdir}/modules/idoutils.cfg-sample" "%{buildroot}%{icinga_sysconfdir}/modules/idoutils.cfg" -# these configs are already available under examples -rm "%{buildroot}%{icinga_sysconfdir}/modules/flapjack.cfg" -rm "%{buildroot}%{icinga_sysconfdir}/modules/livestatus.cfg" -rm "%{buildroot}%{icinga_sysconfdir}/modules/mod_gearman.cfg" -rm "%{buildroot}%{icinga_sysconfdir}/modules/pnp4nagios.cfg" - # fix resource.cfg eventhandler path - otherwise it creates problem with the update_config_files script sed -i "s|/usr/lib/nagios/plugins/eventhandlers|%{icinga_eventhandlerdir}|g" "%{buildroot}%{icinga_sysconfdir}/resource.cfg" @@ -712,6 +706,10 @@ fi %config(noreplace) %{icinga_sysconfdir}/ido2db.cfg %config(noreplace) %{icinga_sysconfdir}/idomod.cfg %config(noreplace) %{icinga_sysconfdir}/modules/idoutils.cfg +%config(noreplace) %{icinga_sysconfdir}/modules/flapjack.cfg +%config(noreplace) %{icinga_sysconfdir}/modules/livestatus.cfg +%config(noreplace) %{icinga_sysconfdir}/modules/mod_gearman.cfg +%config(noreplace) %{icinga_sysconfdir}/modules/pnp4nagios.cfg %config(noreplace) %{icinga_sysconfdir}/objects/ido2db_check_proc.cfg %{_sbindir}/rcido2db %if 0%{?using_systemd} diff --git a/icinga-1.13.1.tar.gz b/icinga-1.13.1.tar.gz deleted file mode 100644 index 23e9d6f..0000000 --- a/icinga-1.13.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dd382bb3bf7edb1dc87818fc74ad8e96b581f27c39a198e0afa7dd2776dcf7b -size 18736941 diff --git a/icinga-1.13.2.tar.gz b/icinga-1.13.2.tar.gz new file mode 100644 index 0000000..3d57467 --- /dev/null +++ b/icinga-1.13.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f319d38b4b3f0ee63d4f20029a86a1fb824dd4c3699b6ca7f147a6c4afdecfbc +size 18736952 diff --git a/icinga-exec-start-pre b/icinga-exec-start-pre index 48976d2..f3716aa 100644 --- a/icinga-exec-start-pre +++ b/icinga-exec-start-pre @@ -43,8 +43,18 @@ done # make sure that all necessary directories are there install -d -m755 -o$icinga_user -g$icinga_group $(dirname "$lock_file") -install -d -m775 -o$icinga_user -g$icinga_group "$temp_path" install -d -m775 -o$icinga_user -g$icinga_group $(dirname "$temp_file") +if [ ! -d "$temp_path" ]; then + case "$temp_path" in + /var/run/icinga/tmp) + install -d -m775 -o$icinga_user -g$icinga_group "$temp_path" + ;; + *) + /bin/logger -t rcicinga "$temp_path does not exist - creating now" + install -d -m775 -o$icinga_user -g$icinga_group "$temp_path" + ;; + esac +fi # create command file with correct permissions mkfifo -m 660 "$command_file"