Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2013-03-18 07:05:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icinga", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2013-02-14 20:39:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2013-03-18 07:05:56.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Mar 10 21:26:00 UTC 2013 - lars@linux-schulserver.de + +- move temp_file and temp_dir below /var/run/icinga as this location + is tmpfs on newer systems which speeds up tempfile creation and + "handles" the removal during shutdown automatically +- use daemonchk.cgi for "rcicinga status", if possible + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.IwbZ9i/_old 2013-03-18 07:05:58.000000000 +0100 +++ /var/tmp/diff_new_pack.IwbZ9i/_new 2013-03-18 07:05:58.000000000 +0100 @@ -278,7 +278,9 @@ --with-ido2db-lockfile="%{icinga_ido2db_lockfile}" \ --with-ido-sockfile="%{icinga_ido2db_socketfile}" \ --with-idomod-tmpfile="%{icinga_idomod_tmpfile}" \ - --with-state-dir="%{icinga_spooldir}" + --with-state-dir="%{icinga_spooldir}" \ + --with-temp-file="%{icinga_tempfile}" \ + --with-temp-dir="%{icinga_tempdir}" make %{?_smp_mflags} all ++++++ rcicinga ++++++ --- /var/tmp/diff_new_pack.IwbZ9i/_old 2013-03-18 07:05:58.000000000 +0100 +++ /var/tmp/diff_new_pack.IwbZ9i/_new 2013-03-18 07:05:58.000000000 +0100 @@ -31,10 +31,11 @@ . /etc/rc.status -ICINGA_BIN="/usr/sbin/icinga" -ICINGA_CFG="/etc/icinga/icinga.cfg" -ICINGA_SYSCONFIG="/etc/sysconfig/icinga" -ICINGA_CFG_ERR_LOG="/var/log/icinga/config.err" +ICINGA_BIN='/usr/sbin/icinga' +ICINGA_CFG='/etc/icinga/icinga.cfg' +ICINGA_SYSCONFIG='/etc/sysconfig/icinga' +ICINGA_CFG_ERR_LOG='/var/log/icinga/config.err' +ICINGA_DAEMONCHK='/usr/lib/icinga/cgi/daemonchk.cgi' # Read config and log errors in logfile function config_check () { @@ -135,6 +136,7 @@ status_file="$(get_var status_file)" log_file="$(get_var log_file)" temp_file="$(get_var temp_file)" +temp_path="$(get_var temp_path)" state_retention_file="$(get_var state_retention_file)" command_file="$(get_var command_file)" resource_file="$(get_var resource_file)" @@ -154,10 +156,11 @@ : ${state_retention_file:=/var/spool/icinga/retention.dat} : ${status_file:=/var/spool/icinga/status.dat} : ${check_external_commands:=0} +: ${temp_path:=/var/run/icinga/tmp} +: ${temp_file:=/var/run/icinga/icinga.tmp} # files to remove : ${command_file:=/var/run/icinga/icinga.cmd} : ${lock_file:=/var/run/icinga/icinga.pid} -: ${temp_file:=/tmp/icinga.tmp} # Reset status of this service rc_reset @@ -165,14 +168,23 @@ case "$1" in start) echo -n "Starting Icinga " - # create checkresult dir if missing if [ ! -d "$check_result_path" ]; then mkdir -p "$check_result_path" chown $icinga_user:$icinga_group "$check_result_path" chmod 775 "$check_result_path" fi - + 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 config_check if [ $? -eq 0 ]; then # check if icinga is already running @@ -181,7 +193,6 @@ check_files check_lock_file fi - startproc $NICELEVEL -p "$lock_file" "$ICINGA_BIN" -d "$ICINGA_CFG" if [ "$check_external_commands" != 0 ]; then while [ ! -e "$command_file" ] && [ $ICINGA_TIMEOUT -gt 0 ]; do @@ -203,7 +214,6 @@ # happen, and then the exiting icinga will remove the # new Lockfile, allowing multiple icinga daemons # to (sooner or later) run - John Sellens - if checkproc "$ICINGA_BIN" ; then killproc -p "$lock_file" -TERM "$ICINGA_BIN" sleep 1 @@ -259,7 +269,15 @@ ;; status) echo -n "Checking for Icinga " - checkproc -p "$lock_file" "$ICINGA_BIN" + if [ -x "$ICINGA_DAEMONCHK" ]; then + if "$ICINGA_DAEMONCHK" -l "$lock_file"; then + rc_failed 0 + else + rc_failed 1 + fi + else + checkproc -p "$lock_file" "$NAGIOS_BIN" + fi rc_status -v ;; check) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org