--- icinga-1.0.2.orig/debian/icinga-core.dirs
+++ icinga-1.0.2/debian/icinga-core.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/icinga
--- icinga-1.0.2.orig/debian/compat
+++ icinga-1.0.2/debian/compat
@@ -0,0 +1 @@
+7
--- icinga-1.0.2.orig/debian/icinga-idoutils.examples
+++ icinga-1.0.2/debian/icinga-idoutils.examples
@@ -0,0 +1 @@
+module/idoutils/db/*
--- icinga-1.0.2.orig/debian/icinga-cgi.config
+++ icinga-1.0.2/debian/icinga-cgi.config
@@ -0,0 +1,66 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+# (taken from the webapps-common httpd functions)
+# wc_httpd_installed: test for installed httpds
+# usage:
+# wc_httpd_installed [ httpd1 httpd2 ... ]
+#
+# no arguments implies to test for all servers
+wc_httpd_installed(){
+ local httpds
+ if [ "$*" ]; then
+ httpds=$*
+ else
+ httpds=$wc_httpd_supported
+ fi
+ for f in $httpds; do
+ if test -x /usr/sbin/$f; then
+ echo $f
+ fi
+ done
+}
+
+
+# list of installed servers to check for
+default_servers=`wc_httpd_installed apache2`
+# convert list to comma seperated list
+server_list=`echo $default_servers | sed -e 's/[[:space:]][[:space:]]*/, /g'`
+
+# if they haven't already been prompted, preseed the server selection
+db_fget icinga/httpd seen
+if [ "$RET" = "false" ]; then
+ db_set icinga/httpd $server_list
+fi
+
+db_input high icinga/httpd || true
+db_go || true
+db_get icinga/httpd
+keepgoing="$RET"
+
+if [ "$keepgoing" ]; then
+ # the passwords are reset at the end of every postinst run,
+ # however, they are left in the "seen" state so that the
+ # admin is not prompted for them at every upgrade.
+ while [ ! "$passwordsmatch" ]; do
+ #only ask for a password if no htpasswd exists
+ test -f /etc/icinga/htpasswd.users && break
+ db_input high icinga/adminpassword || true
+ db_input high icinga/adminpassword-repeat || true
+ db_go || true
+ db_get icinga/adminpassword
+ p1="$RET"
+ db_get icinga/adminpassword-repeat
+ p2="$RET"
+ if [ "$p1" = "$p2" ]; then
+ passwordsmatch="yes"
+ else
+ db_fset icinga/adminpassword seen false
+ db_fset icinga/adminpassword-repeat seen false
+ db_fset icinga/adminpassword-mismatch seen false
+ db_input critical icinga/adminpassword-mismatch || true
+ fi
+ done
+fi
+db_go || true
--- icinga-1.0.2.orig/debian/icinga.8
+++ icinga-1.0.2/debian/icinga.8
@@ -0,0 +1,47 @@
+.TH icinga "8" "March 2010" "sean finney" "nagios"
+.SH NAME
+icinga \- network/systems status monitoring daemon
+
+.SH SYNOPSIS
+.B icinga [\-h] [\-v] [\-s] [\-d] <main_config_file>
+.br
+
+.SH DESCRIPTION
+.B icinga
+is a daemon program that monitors the status of various network
+accessible systems, devices, and more. For more information, please
+consult the online documentation available at http://www.icinga.org,
+or on your Icinga server's web page.
+
+.SH OPTIONS
+.TP
+main_config_file
+The main configuration file. On debian systems this defaults to
+/etc/icinga/icinga.cfg
+.TP
+\fB\-h\fR
+A helpful usage message
+.TP
+\fB\-v\fR
+Reads all data in the configuration files and performs a basic
+verification/sanity check. Always make sure you verify your
+config data before (re)starting Icinga.
+.TP
+\fB\-s\fR
+Shows projected/recommended check scheduling information based
+on the current data in the configuration files.
+.TP
+\fB\-d\fR
+Starts Icinga in daemon mode (instead of as a foreground process).
+
+.SH FILES
+.TP
+.IP /etc/icinga
+Default configuration directory for Icinga
+
+.SH AUTHOR
+Icinga was started as Nagios by Ethan Galstad <nagios@nagios.org>.
+Icinga is maintained by the Icinga Project <info@icinga.org>.
+This manual page was written by sean finney <seanius@debian.org> for the Debian
+GNU/Linux operating system (but it may be freely used, modified, and
+redistributed by others).
--- icinga-1.0.2.orig/debian/mini_epn_icinga.8.txt
+++ icinga-1.0.2/debian/mini_epn_icinga.8.txt
@@ -0,0 +1,31 @@
+:man source: Nagios/Icinga
+:man version: {revnumber}
+:man manual: mini_epn
+
+mini_epn(8)
+==========
+
+NAME
+----
+mini_epn - too to nagios/icingaplugins inside of an embedded perl interpreter
+
+SYNOPSIS
+--------
+*mini_epn*
+
+DESCRIPTION
+-----------
+After calling *mini_epn* an embedded perl interpreter gets started and asks for you a script to execute under the interpreter. To exit the interpreter loop press ^d at the prompt.
+
+EXAMPLES
+--------
+
+ # mini_epn
+ Enter file name: /usr/lib/nagios/plugins/check_linux_raid
+ embedded perl plugin return code and output was: 0 & 'OK md0 status=[UU]. md1 status=[UU].
+
+AUTHOR
+------
+This manpage was written by Alexander Wirt <formorer@debian.org> for the Debian Distribution.
+
+
--- icinga-1.0.2.orig/debian/changelog
+++ icinga-1.0.2/debian/changelog
@@ -0,0 +1,73 @@
+icinga (1.0.2-2) unstable; urgency=low
+
+ * Backport some patches from 1.0.3 for squeeze
+ - Fix image urls in css
+ - Don't overwrite temp_path if it is before check_result_path in config
+ - Fix execvp handling
+ - Fix volatile check
+ - Fix macro processing in extinfo.cgi
+ - Fix invalid pointer in extinfo.cgi
+ * Icinga Plugins does not exist
+ * Fix typo in watch file
+
+ -- Alexander Wirt <formorer@debian.org> Mon, 09 Aug 2010 18:23:06 +0200
+
+icinga (1.0.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Bump standards version (no changes needed)
+ * Fix eventhandler paths
+ * Remove 40_fix_spurious_dollar_signs_added_to_command_lines -
+ now upstream
+
+ -- Alexander Wirt <formorer@debian.org> Sat, 03 Jul 2010 12:28:08 +0200
+
+icinga (1.0.1-4) unstable; urgency=low
+
+ * Fix mini_epn p1 path
+ * Backport several ido2db fixes from git
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #579934
+ * [Debconf translation updates]
+ * Spanish (Omar Campagne). Closes: #579656,#581823
+ * Czech (Martin Sin). Closes: #580471
+ * Basque (Iñaki Larrañaga Murgoitio). Closes: #580478
+ * Danish (Joe Hansen). Closes: #580571,#580572
+ * Brazilian Portuguese (Bruno Gurgel Gomes de Oliveira).
+ Closes: #580656, #581562
+ * Russian (Yuri Kozlov). Closes: #580765
+ * Italian (Luca Monducci). Closes: #580768
+ * Vietnamese (Clytie Siddall). Closes: #581538
+ * Portuguese (Américo Monteiro). Closes: #582319
+ * German (Matthias Julius). Closes: #582348
+ * French (Steve Petruzzello). Closes: #582643
+ * Swedish (Martin Bagge). Closes: #582699
+
+ -- Alexander Wirt <formorer@debian.org> Tue, 13 Apr 2010 11:52:52 +0200
+
+icinga (1.0.1-3) unstable; urgency=low
+
+ * its nagios-plugins, not icinga-plugins
+ * Use alternatives for mini_epn (Closes: #577493)
+ * Don't depend on non-existing virtual facility $icinga
+ (Closes: #577166)
+ * Update french po translation (Closes: #577152)
+ * Update russian po translation (Closes: #577170)
+ * Update swedish po translation (Closes: #577553)
+ * Update portuguese po translation (Closes: #577137)
+
+ -- Alexander Wirt <formorer@debian.org> Thu, 08 Apr 2010 19:58:16 +0200
+
+icinga (1.0.1-2) unstable; urgency=low
+
+ * Fix maintainer address
+ * Disable context sensitive help
+ * Recommend php5-mysql | php5-pgsql for the phpapi package
+
+ -- Alexander Wirt <formorer@debian.org> Wed, 07 Apr 2010 14:31:39 +0200
+
+icinga (1.0.1-1) unstable; urgency=low
+
+ * Initial packaging (Closes: #573880)
+
+ -- Alexander Wirt <formorer@debian.org> Sat, 27 Mar 2010 09:59:41 +0100
--- icinga-1.0.2.orig/debian/icinga-idoutils.config
+++ icinga-1.0.2/debian/icinga-idoutils.config
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+#set -x
+
+. /usr/share/debconf/confmodule
+
+if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+ dbc_dbtypes="mysql, pgsql"
+ dbc_dbname="icinga"
+ dbc_authmethod_user="password"
+ . /usr/share/dbconfig-common/dpkg/config
+ dbc_go icinga-idoutils $@
+fi
+
--- icinga-1.0.2.orig/debian/icingastats.8
+++ icinga-1.0.2/debian/icingastats.8
@@ -0,0 +1,51 @@
+.TH icingastats "8" "February 2006" "sean finney " "icinga"
+.SH NAME
+icingastats \- report statistics information from the Icinga system
+
+.SH SYNOPSIS
+.B icingastats [\-hVL] [\-c config] [\-m] [\-d]
+.br
+
+.SH DESCRIPTION
+.B icingastats
+Is a program designed to provide information on the running Icinga
+system. It can provide a brief summary of information, or it can
+be used to export specific information about the nagios system
+into an MRTG-compatible format.
+For more information please consult the Icinga online documentation
+available at http://www.icinga.org or the documentation available
+with your icinga server's web page.
+
+.SH OPTIONS
+.TP
+\fB\-c\fR|\-\-config=FILE
+The main configuration file. On debian systems this defaults to
+/etc/icinga/icinga.cfg
+.TP
+\fB\-m\fR|\-\-mrtg
+Print output in MRTG-compatible format. For more details run
+icingastats with \-\-help
+.TP
+\fB\-d\fR|\-\-data=VARS
+Comma-seperated list of variables to output in MRTG format. For
+more details run icingastats with \-\-help.
+.TP
+\fB\-h\fR|\-\-help
+A helpful usage message
+.TP
+\fB\-V\fR|\-\-version
+Print version information
+.TP
+\fB\-L\fR|\-\-license
+Print license details
+
+.SH FILES
+.TP
+.IP /etc/icinga
+Default configuration directory for icinga
+
+.SH AUTHOR
+Icinga was started as Nagios by Ethan Galstad <nagios@nagios.org>. Icinga is
+maintained by the Icinga Project <info@icinga.org>. This manual page was
+written by sean finney <seanius@debian.org> for the Debian GNU/Linux operating
+system (but it may be freely used, modified, and redistributed by others).
--- icinga-1.0.2.orig/debian/icinga-core.prerm
+++ icinga-1.0.2/debian/icinga-core.prerm
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+# we attempt to stop icinga twice, once in icinga-common's prerm
+# and once here. otherwise, if icinga+icinga-common are being purged,
+# the /usr/sbin/icinga binary could disappear before icinga-common's
+# prerm script runs, which would prevent it from being able to stop
+# the binary.
+if [ -x "/etc/init.d/icinga" ]; then
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d icinga stop || true
+ else
+ /etc/init.d/icinga stop || true
+ fi
+fi
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/icinga-core.links
+++ icinga-1.0.2/debian/icinga-core.links
@@ -0,0 +1 @@
+usr/share/doc/icinga-common usr/share/doc/icinga-core
--- icinga-1.0.2.orig/debian/README.source
+++ icinga-1.0.2/debian/README.source
@@ -0,0 +1,2 @@
+We use dpatch for patch handling inside our icinga packages. Please see
+/usr/share/doc/dpatch/README.source.gz (if you have installed dpatch) for documentation about dpatch.
--- icinga-1.0.2.orig/debian/icinga-common.docs
+++ icinga-1.0.2/debian/icinga-common.docs
@@ -0,0 +1,2 @@
+README
+UPGRADING
--- icinga-1.0.2.orig/debian/httpd.webapps-common
+++ icinga-1.0.2/debian/httpd.webapps-common
@@ -0,0 +1,188 @@
+# httpd-related functions
+# taken from the webapps-common project
+# copyright (c) 2005, sean finney (GPL)
+
+wc_httpd_apaches="apache2"
+
+# if they have not specified what they support, assume support for all
+if [ ! "$wc_httpd_supported" ]; then
+ wc_httpd_supported="$wc_httpd_apaches"
+fi
+
+#
+# wc_httpd_installed: test for installed httpds
+# usage:
+# wc_httpd_installed [ httpd1 httpd2 ... ]
+#
+# no arguments implies to test for all servers
+wc_httpd_installed(){
+ local httpds
+ if [ "$*" ]; then
+ httpds=$*
+ else
+ httpds=$wc_httpd_supported
+ fi
+ for f in $httpds; do
+ if test -x /usr/sbin/$f; then
+ echo $f
+ fi
+ done
+}
+
+#
+# wc_httpd_running: test for running httpds
+# usage:
+# wc_httpd_running [ httpd1 httpd2 ... ]
+#
+# no arguments implies to test for all servers
+wc_httpd_running(){
+ local httpds
+ if [ "$*" ]; then
+ httpds=$*
+ else
+ httpds=$wc_httpd_supported
+ fi
+ for f in $httpds; do
+ if pgrep -fx "/usr/sbin/$f( .*)*$" >/dev/null; then
+ echo $f
+ fi
+ done
+}
+
+# wc_httpd_invoke: issue start/stop/etc command to web server init script
+# usage:
+# wc_httpd_invoke {start|stop|status|whatever} [ httpd1 httpd2 ... ]
+#
+# no servers implies to invoke all running servers
+wc_httpd_invoke(){
+ local httpds cmd err
+ if [ ! "$1" ]; then
+ echo "i need at least a command!" 2>&1
+ return 1
+ fi
+ cmd="$1"
+ shift
+ if [ "$*" ]; then
+ httpds=$*
+ else
+ httpds=`wc_httpd_running`
+ fi
+ for f in $httpds; do
+ if [ -x /etc/init.d/$f ]; then
+ invoke-rc.d $f $cmd || return $?
+ fi
+ done
+}
+
+# wc_httpd_apache_include: include a file in the apache configuration
+# usage:
+# wc_httpd_apache_include file name [ httpd1 httpd2 ... ]
+#
+# no arguments implies all installed apache servers
+wc_httpd_apache_include(){
+ local h incfile httpds confdir
+ if [ ! "$1" ]; then
+ echo "i need at least a file!" 2>&1
+ return 1
+ fi
+ incfile="$1"
+ shift
+ if [ ! "$1" ]; then
+ echo "i also need a name!" 2>&1
+ return 1
+ fi
+ name="$1"
+ shift
+ if [ ! -e "$incfile" ]; then
+ echo "include file $incfile does not exist!" 2>&1
+ return 1
+ fi
+ if [ "$*" ]; then
+ httpds=$*
+ else
+ httpds=`wc_httpd_installed $wc_httpd_supported`
+ fi
+ for h in $httpds; do
+ confdir="/etc/$h/conf.d"
+ conflink="$confdir/${name}.conf"
+ if [ -d "$confdir" -a ! -e "$conflink" ]; then
+ ln -s "$incfile" "$conflink"
+ fi
+ done
+}
+
+# wc_httpd_apache_configured: determine what servers are configured for a pkg
+# usage:
+# wc_httpd_apache_configured file name [ httpd1 httpd2 ... ]
+#
+# no arguments implies all installed apache servers
+# outputs the list of servers that are configured with file->name
+wc_httpd_apache_configured(){
+ local h incfile httpds confdir
+ if [ ! "$1" ]; then
+ echo "i need at least a file!" 2>&1
+ return 1
+ fi
+ incfile="$1"
+ shift
+ if [ ! "$1" ]; then
+ echo "i also need a name!" 2>&1
+ return 1
+ fi
+ name="$1"
+ shift
+ if [ ! -e "$incfile" ]; then
+ echo "include file $incfile does not exist!" 2>&1
+ return 1
+ fi
+ if [ "$*" ]; then
+ httpds=$*
+ else
+ httpds=`wc_httpd_installed $wc_httpd_supported`
+ fi
+ for h in $httpds; do
+ confdir="/etc/$h/conf.d"
+ conflink="$confdir/${name}.conf"
+ if [ -L "$conflink" ]; then
+ echo "$h "
+ fi
+ done
+}
+
+# wc_httpd_apache_uninclude: uninclude a file in the apache configuration
+# usage:
+# wc_httpd_apache_uninclude file name [ httpd1 httpd2 ... ]
+#
+# no arguments implies all installed apache servers
+wc_httpd_apache_uninclude(){
+ local h incfile name httpds conflink
+ if [ ! "$1" ]; then
+ echo "i need at least a file!" 2>&1
+ return 1
+ fi
+ incfile="$1"
+ shift
+ if [ ! "$1" ]; then
+ echo "i also need a name!" 2>&1
+ return 1
+ fi
+ name="$1"
+ shift
+ if [ ! -e "$incfile" ]; then
+ echo "include file $incfile does not exist!" 2>&1
+ return 1
+ fi
+ if [ "$*" ]; then
+ httpds=$*
+ else
+ httpds=`wc_httpd_installed $wc_httpd_supported`
+ fi
+ for h in $httpds; do
+ conflink="/etc/$h/conf.d/${name}.conf"
+ if [ -L "$conflink" ]; then
+ rm -f "$conflink"
+ elif [ -e "$conflink" ]; then
+ echo "warning: $conflink exists but is not a link" >&2
+ fi
+ done
+}
--- icinga-1.0.2.orig/debian/rules
+++ icinga-1.0.2/debian/rules
@@ -0,0 +1,192 @@
+#!/usr/bin/make -f
+# debian/rules makefile for icinga
+
+# export DH_VERBOSE=1
+
+b := $(shell pwd)/debian
+
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# -Wall disabled until source is fixed to not print tons of warnings with it. :)
+#CFLAGS = -Wall -g
+CFLAGS = -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+
+SHELL = /bin/sh -e
+CONFIGURE = CFLAGS='$(CFLAGS)' ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --bindir=/usr/sbin \
+ --sbindir=/usr/lib/cgi-bin/icinga \
+ --datarootdir=/usr/share/icinga/htdocs \
+ --sysconfdir=/etc/icinga \
+ --infodir=/usr/share/info \
+ --libexecdir=/usr/lib/nagios/plugins \
+ --localstatedir=/var/lib/icinga \
+ --enable-event-broker \
+ --enable-embedded-perl \
+ --with-icinga-user=nagios \
+ --with-icinga-group=nagios \
+ --with-command-user=nagios \
+ --with-command-group=nagios \
+ --with-init-dir=/etc/init.d \
+ --with-lockfile=/var/run/icinga/icinga.pid \
+ --with-mail=/usr/bin/mail \
+ --with-perlcache \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --with-htmurl=/icinga \
+ --with-cgiurl=/cgi-bin/icinga \
+ --enable-idoutils
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir -a
+ dh_testroot -a
+ if test -f Makefile; then make distclean; fi
+ rm -f patch-stamp install-stamp configure-stamp build-stamp fix-configs-stamp
+ rm -rf debian-configs
+ -rm contrib/perlxsi.c
+ find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \;
+ -rm -f platform.h auto-include.h
+ find -type d -name build -print0 | xargs -0 -r rm -rf \;
+ find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
+ dh_clean
+ debconf-updatepo
+
+fix-configs: fix-configs-stamp
+fix-configs-stamp: configure-stamp
+ mkdir -p debian-configs
+ sed -e '/Sample CGI/ s/\([0-9]\.[0-9]\.[0-9]\)//' \
+ -e '/Last Modified/,+1 d' \
+ sample-config/cgi.cfg > debian-configs/cgi.cfg
+ sed -e '/Sample Main Config/ s/\([0-9]\.[0-9]\.[0-9]\)//' \
+ -e '/Last Modified/ d' \
+ sample-config/icinga.cfg > debian-configs/icinga.cfg
+ sed -e '/SAMPLE COMMAND DEFINITIONS/ s/\([0-9]\.[0-9]\.[0-9]\)//' \
+ -e '/Last Modified/,+1 d' \
+ -e '/^#$$/ d' sample-config/template-object/commands.cfg > debian-configs/commands.cfg
+ sed -i \
+ -e "s/^\(db_host=\).*/\1_DBC_DBSERVER_/" \
+ -e "s/^\(db_servertype=\).*/\1_DBC_DBTYPE_/" \
+ -e "s/^\(db_port=\).*/\1_DBC_DBPORT_/" \
+ -e "s/^\(db_name=\).*/\1_DBC_DBNAME_/" \
+ -e "s/^\(db_user=\).*/\1_DBC_DBUSER_/" \
+ -e "s/^\(db_pass=\).*/\1_DBC_DBPASS_/" module/idoutils/config/ido2db.cfg-sample
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir -a
+ @echo "Doing $@"
+ if test -f Makefile; then make clean; fi
+ ln -sf /usr/share/misc/config.sub .
+ ln -sf /usr/share/misc/config.guess .
+ rm -f config.cache
+ $(CONFIGURE)
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: patch-stamp configure-stamp
+ dh_testdir -a
+ @echo "Doing $@"
+ $(MAKE) all
+ make -C contrib
+ touch build-stamp
+
+patch: patch-stamp
+patch-stamp:
+ @echo "Doing $@"
+ dpatch --with-cpp apply-all
+ dpatch --with-cpp cat-all >patch-stamp
+
+unpatch:
+ @echo "Doing $@"
+ dpatch --with-cpp deapply-all
+ rm -rf patch-stamp debian/patched
+
+install: install-stamp
+install-stamp: build-stamp fix-configs-stamp
+ @echo "Doing $@"
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdirs -a -i
+ make install-unstripped DESTDIR=$b/tmp INSTALL_OPTS=""
+ make install-idoutils DESTDIR=$b/icinga-idoutils INSTALL_OPTS=""
+ make install-api DESTDIR=$b/icinga-phpapi INSTALL_OPTS=""
+ #We have to rename the sample files
+ #mv $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample $b/icinga-idoutils/etc/icinga/ido2db.cfg
+ mv $b/icinga-idoutils/etc/icinga/idomod.cfg-sample $b/icinga-idoutils/etc/icinga/idomod.cfg
+ mv $b/icinga-idoutils/usr/sbin/idomod.o $b/icinga-idoutils/usr/lib/icinga/
+ cp module/idoutils/db/mysql/mysql.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/install/mysql
+ cp module/idoutils/db/pgsql/pgsql.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/install/pgsql
+ mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2
+ cp module/idoutils/db/mysql/mysql-upgrade-1.0.2-fix-object-relations.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2/02_mysql-upgrade-1.0.2-fix-object-relations.sql
+ cp module/idoutils/db/mysql/mysql-upgrade-1.0.2.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2/01_mysql-upgrade-1.0.2.sql
+ # set up /var/cache/icinga for access by www-data
+ chgrp www-data ${b}/icinga-common/var/cache/icinga
+ chmod g+s ${b}/icinga-common/var/cache/icinga
+ chown root:www-data ${b}/icinga-common/var/lib/icinga/rw
+ chmod 700 ${b}/icinga-common/var/lib/icinga/rw
+ dh_install -i
+ # we use the versions in debian
+ rm ${b}/tmp/usr/share/icinga/htdocs/js/mootools.js
+ rm ${b}/tmp/usr/share/icinga/htdocs/js/prototype.js
+ rm ${b}/tmp/usr/share/icinga/htdocs/js/scriptaculous.js
+ dh_link -i
+ dh_lintian
+ dh_installdocs -i
+ dh_installman -a -picinga
+ dh_installexamples
+ dh_installlogrotate
+ dh_installchangelogs -i
+ dh_installinit --name icinga -- defaults 30 18
+ dh_installinit -picinga-idoutils --name ido2db -- defaults 35 20
+ chmod 755 ${b}/icinga-common/var/lib/icinga
+ # the real version is in -cgi
+ rm ${b}/icinga-common/etc/icinga/cgi.cfg
+
+
+binary: binary-arch binary-indep
+binary-arch: install-stamp
+ @echo "Doing $@"
+ dh_testdir -a
+ dh_testroot -a
+ dh_installchangelogs -a
+ dh_installdocs -a
+ dh_installdebconf -a
+ dh_install -a
+ rm -rf ${b}/icinga/usr/share/doc/
+ rm -rf ${b}/icinga-core/usr/share/doc/
+ dh_link -a
+ mkdir -p ${b}/icinga-dbg/usr/bin/
+ mv contrib/mini_epn ${b}/icinga-dbg/usr/bin/mini_epn_icinga
+ chmod 600 ${b}/icinga-common/etc/icinga/resource.cfg
+ # fix permissions of p1
+ chmod 755 ${b}/icinga-core/usr/lib/icinga/p1.pl
+ dh_strip -a --dbg-package=icinga-dbg
+ dh_compress -a
+ dh_fixperms -a -X/var/cache/icinga
+ dh_makeshlibs -a -V
+ dh_installdeb -a
+ dh_perl -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary-indep: install-stamp
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i -Xicinga/resource.cfg
+ dh_installdebconf -i
+ dh_perl -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+.PHONY: binary-indep binary-arch build configure binary install patch unpatch
--- icinga-1.0.2.orig/debian/icinga-core.install
+++ icinga-1.0.2/debian/icinga-core.install
@@ -0,0 +1,3 @@
+usr/sbin/icinga
+usr/sbin/icingastats
+usr/sbin/p1.pl usr/lib/icinga/
--- icinga-1.0.2.orig/debian/copyright
+++ icinga-1.0.2/debian/copyright
@@ -0,0 +1,39 @@
+This package was debianized by Alexander Wirt <formorer@debian.org>.
+
+It was downloaded from http://www.icinga.org/
+
+Current Debian Maintainers: The nagios packaging packaging team
+ http://alioth.debian.org/projects/pkg-nagios/
+
+Mailing-List: pkg-nagios-devel@lists.alioth.debian.org
+
+Upstream Author: Ethan Galstad <nagios@nagios.org>
+ Icinga Development Team (info@icinga.org)
+
+Copyright (c) 1999-2009 Ethan Galstad (nagios@nagios.org)
+Copyright (c) 2009-2010 Icinga Development Team (info@icinga.org)
+
+License:
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public
+License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+p1.pl is Copyright 2007 by Stanley Hopcroft
+
+This program is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+On Debian systems, the complete text of the Artistic
+License, can be found in /usr/share/common-licenses/Artistic.
+
+The file common/snprintf.c is Copyright 1995 by Patrick Powell
+
+This code is based on code written by Patrick Powell (papowell@astart.com)
+It may be used for any purpose as long as this notice remains intact
+on all source code distributions
+
+
--- icinga-1.0.2.orig/debian/icinga-doc.dirs
+++ icinga-1.0.2/debian/icinga-doc.dirs
@@ -0,0 +1,2 @@
+usr/share/icinga/htdocs
+etc/icinga/stylesheets
--- icinga-1.0.2.orig/debian/watch
+++ icinga-1.0.2/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/icinga/icinga-([0-9-.]+)\.tar\.gz
--- icinga-1.0.2.orig/debian/ido2db.8
+++ icinga-1.0.2/debian/ido2db.8
@@ -0,0 +1,51 @@
+'\" t
+.\" Title: ido2db
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\" Date: 03/16/2010
+.\" Manual: ido2db
+.\" Source: Nagios/Icinga
+.\" Language: English
+.\"
+.TH "IDO2DB" "8" "03/16/2010" "Nagios/Icinga" "ido2db"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ido2db \- store icinga events and configs in database
+.SH "SYNOPSIS"
+.sp
+\fBido2db\fR \-c <config_file> [\-i] [\-f]
+.SH "DESCRIPTION"
+.sp
+Stores Icinga event and configuration data to a database for later retrieval and processing\&. Clients that are capable of sending data to the IDO2DB daemon include the LOG2NDO utility and IDOMOD event broker module\&.
+.SH "OPTIONS"
+.PP
+\fB\-i\fR
+.RS 4
+Run under INETD/XINETD\&.
+.RE
+.PP
+\fB\-f\fR
+.RS 4
+Don\(cqt daemonize, run in foreground\&.
+.RE
+.SH "AUTHOR"
+.sp
+This manpage was written by Alexander Wirt <formorer@debian\&.org> for the Debian Distribution\&.
--- icinga-1.0.2.orig/debian/README.Debian
+++ icinga-1.0.2/debian/README.Debian
@@ -0,0 +1,47 @@
+Welcome to the icinga package for Debian GNU/Linux!
+Below are some debian-specific notes which may be of help to you.
+
+If you have questions about using/configuring nagios, you should probably
+contact the nagios-users mailing list and NOT the maintainers:
+
+ nagios-users@lists.sourceforge.net
+
+Of course we'd be happy to hear about any bugs you find, and are always
+open to discussing any ideas you might have for improvement. you can
+contact the debian icinga maintainers at:
+
+ pkg-nagios-devel@lists.alioth.debian.org
+
+External Commands
+^^^^^^^^^^^^^^^^^
+Icinga is not configured to look for external commands in the
+default configuration as a security feature. To enable external
+commands, you need to allow the web server write access to the
+nagios command pipe. the simplest way of doing this is to
+set check_external_commands=1 in your Icinga configuration,
+and then change the permissions in a way which will be maintained
+across package upgrades (otherwise dpkg will overwrite your
+permission changes). The following is the recommended approach:
+
+- activate external command checks in the Icinga configuration. this
+ can be done by setting check_external_commands=1 in the file
+ /etc/icinga/icinga.cfg.
+
+- perform the following commands to change directory permissions and
+ to make the changes permanent:
+
+/etc/init.d/icinga stop
+dpkg-statoverride --update --add nagios www-data 2710 /var/lib/icinga/rw
+dpkg-statoverride --update --add nagios nagios 751 /var/lib/icinga
+/etc/init.d/icinga start
+
+Manually Providing / Overriding Authentication Configuration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The default debian configuration for icinga+apache is to use
+an htpasswd style file in /etc/icinga/htpasswd.users. if you
+choose not to (or otherwise didn't) provide a password during package
+configuration, we assume that you know what you're doing and will
+not get in your way. however, if you don't know what you're doing,
+you should either dpkg-reconfigure icinga-common and provide
+a password, or read the fine manual for htpasswd(1).
--- icinga-1.0.2.orig/debian/icinga-cgi.examples
+++ icinga-1.0.2/debian/icinga-cgi.examples
@@ -0,0 +1 @@
+debian/apache2.conf
--- icinga-1.0.2.orig/debian/icinga-idoutils.ido2db.init
+++ icinga-1.0.2/debian/icinga-idoutils.ido2db.init
@@ -0,0 +1,146 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: ido2db
+# Required-Start: $remote_fs $syslog $named $network $time icinga
+# Required-Stop: $remote_fs $syslog $named $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: ido2db initscript
+# Description: icinga-databojects daemon
+### END INIT INFO
+
+# Author: Alexander Wirt <formorer@debian.org>
+#
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="icinga-dataobjects daemon"
+NAME=ido2db
+DAEMON=/usr/sbin/$NAME
+PIDFILE=/var/run/icinga/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+CFG=/etc/icinga/ido2db.cfg
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/icinga ] && . /etc/default/icinga
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+if [ "$IDO2DB" != "yes" ]; then
+ if [ "$VERBOSE" != no ]; then
+ log_warning_msg "Not starting ido2db - edit /etc/default/icinga to enable it"
+ fi
+ exit 0
+fi
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ test -d $(dirname $PIDFILE) || mkdir -p $(dirname $PIDFILE)
+ chown nagios:nagios $(dirname $PIDFILE)
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+ || return 1
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+ -c $CFG \
+ || return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ # If the above conditions are not satisfied then add some other code
+ # that waits for the process to drop all resources that could be
+ # needed by services started subsequently. A last resort is to
+ # sleep for some time.
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+ [ "$?" = 2 ] && return 2
+ # Many daemons don't delete their pidfiles when they exit.
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+ #reload|force-reload)
+ #
+ # If do_reload() is not implemented then leave this commented out
+ # and leave 'force-reload' as an alias for 'restart'.
+ #
+ #log_daemon_msg "Reloading $DESC" "$NAME"
+ #do_reload
+ #log_end_msg $?
+ #;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
--- icinga-1.0.2.orig/debian/icinga-dbg.prerm
+++ icinga-1.0.2/debian/icinga-dbg.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ "$1" != "upgrade" ]; then
+ update-alternatives --remove mini_epn /usr/bin/mini_epn_icinga
+fi
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/icinga-common.icinga.init
+++ icinga-1.0.2/debian/icinga-common.icinga.init
@@ -0,0 +1,246 @@
+#! /bin/sh
+# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
+# Modified for Debian GNU/Linux
+# by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+# Clamav version by Magnus Ekdahl <magnus@debian.org>
+# Nagios version by Sean Finney <seanius@debian.org> and probably others
+# nagios2 version by Marc Haber <mh+debian-packages@zugschlus.de>
+# icinga version by Alexander Wirt <formorer@debian.org>
+
+### BEGIN INIT INFO
+# Provides: icinga
+# Required-Start: $local_fs $remote_fs $syslog $named $network $time
+# Required-Stop: $local_fs $remote_fs $syslog $named $network
+# Should-Start:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: icinga host/service/network monitoring and management system
+# Description: icinga is a monitoring and management system for hosts, services and networks.
+### END INIT INFO
+
+set -e
+
+. /lib/lsb/init-functions
+
+DAEMON=/usr/sbin/icinga
+NAME="icinga"
+DESC="icinga monitoring daemon"
+ICINGACFG="/etc/icinga/icinga.cfg"
+CGICFG="/etc/icinga/cgi.cfg"
+NICENESS=5
+
+[ -x "$DAEMON" ] || exit 0
+[ -r /etc/default/icinga ] && . /etc/default/icinga
+
+# this is from madduck on IRC, 2006-07-06
+# There should be a better possibility to give daemon error messages
+# and/or to log things
+log()
+{
+ case "$1" in
+ [[:digit:]]*) success=$1; shift;;
+ *) :;;
+ esac
+ log_action_begin_msg "$1"; shift
+ log_action_end_msg ${success:-0} "$*"
+}
+
+check_started () {
+ if [ -e "$CGICFG" ]
+ then
+ check_cmd=$(get_config icinga_check_command $CGICFG)
+ if [ ! "$check_cmd" ]; then
+ log 6 "unable to determine icinga_check_command from $CGICFG!"
+ return 6
+ fi
+ else
+ check_cmd="/usr/lib/nagios/plugins/check_nagios /var/cache/icinga/status.dat 5 '/usr/sbin/icinga'"
+ fi
+
+ eval $check_cmd >/dev/null
+
+ if [ -f "$THEPIDFILE" ]; then
+ pid="$(cat $THEPIDFILE)"
+ if [ "$pid" ] && kill -0 $pid >/dev/null 2>/dev/null; then
+ return 0 # Is started
+ fi
+ fi
+ return 1 # Isn't started
+}
+
+#
+# get_config()
+#
+# grab a config option from icinga.cfg (or possibly another icinga config
+# file if specified). everything after the '=' is echo'd out, making
+# this a nice generalized way to get requested settings.
+#
+get_config () {
+ if [ "$2" ]; then
+ set -- `grep ^$1 $2 | sed 's@=@ @'`
+ else
+ set -- `grep ^$1 $ICINGACFG | sed 's@=@ @'`
+ fi
+ shift
+ echo $*
+}
+
+check_config () {
+ if $DAEMON -v $ICINGACFG >/dev/null 2>&1 ; then
+ # First get the user/group etc Icinga is running as
+ nagios_user="$(get_config icinga_user)"
+ nagios_group="$(get_config icinga_group)"
+ log_file="$(get_config log_file)"
+ log_dir="$(dirname $log_file)"
+
+ return 0 # Config is ok
+ else
+ # config is not okay, so let's barf the error to the user
+ $DAEMON -v $ICINGACFG
+ fi
+}
+
+check_named_pipe () {
+ icingapipe="$(get_config command_file)"
+ if [ -p "$icingapipe" ]; then
+ return 1 # a named pipe exists
+ elif [ -e "$icingapipe" ];then
+ return 1
+ else
+ return 0 # no named pipe exists
+ fi
+}
+
+if [ ! -f "$ICINGACFG" ]; then
+ log_failure_msg "There is no configuration file for Icinga."
+ exit 6
+fi
+
+THEPIDFILE=$(get_config "lock_file")
+[ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/icinga/icinga.pid'
+
+start () {
+ DIRECTORY=$(dirname $THEPIDFILE)
+ [ ! -d $DIRECTORY ] && mkdir -p $DIRECTORY
+ chown nagios:nagios $DIRECTORY
+
+ if ! check_started; then
+ if ! check_named_pipe; then
+ log_action_msg "named pipe exists - removing"
+ rm -f $icingapipe
+ fi
+ if check_config; then
+ start_daemon -n $NICENESS -p $THEPIDFILE $DAEMON -d $ICINGACFG
+ ret=$?
+ else
+ log_failure_msg "errors in config!"
+ log_end_msg 1
+ exit 1
+ fi
+ else
+ log_warning_msg "already running!"
+ fi
+ return $ret
+}
+
+stop () {
+ killproc -p $THEPIDFILE
+ ret=$?
+ if [ `pidof icinga | wc -l ` -gt 0 ]; then
+ echo -n "Waiting for $NAME daemon to die.."
+ cnt=0
+ while [ `pidof icinga | wc -l ` -gt 0 ]; do
+ cnt=`expr "$cnt" + 1`
+ if [ "$cnt" -gt 15 ]; then
+ kill -9 `pidof icinga`
+ break
+ fi
+ sleep 1
+ echo -n "."
+ done
+ fi
+ echo
+ if ! check_named_pipe; then
+ rm -f $icingapipe
+ fi
+ test -e $THEPIDFILE && rm $THEPIDFILE
+ if [ -n "$ret" ]; then
+ return $ret
+ else
+ return $?
+ fi
+}
+
+status()
+{
+ log_action_begin_msg "checking $DAEMON"
+ if check_started; then
+ log_action_end_msg 0 "running"
+ else
+ if [ -e "$THEPIDFILE" ]; then
+ log_action_end_msg 1 "$DAEMON failed"
+ exit 1
+ else
+ log_action_end_msg 1 "not running"
+ exit 3
+ fi
+ fi
+}
+
+check () {
+ $DAEMON -v $ICINGACFG
+}
+
+reload () {
+ # Check first
+ if check_config; then
+ if check_started; then
+ killproc -p $THEPIDFILE $DAEMON 1
+ else
+ log_warning_msg "Not running."
+ fi
+ else
+ log_failure_msg "errors in config!"
+ log_end_msg 6
+ exit 6
+ fi
+}
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC" "$NAME"
+ start
+ log_end_msg $?
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ stop
+ log_end_msg $?
+ ;;
+ restart)
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ stop
+ if [ -z "$?" -o "$?" = "0" ]; then
+ start
+ fi
+ log_end_msg $?
+ ;;
+ reload|force-reload)
+ log_daemon_msg "Reloading $DESC configuration files" "$NAME"
+ reload
+ log_end_msg $?
+ ;;
+ status)
+ status
+ ;;
+ check)
+ check
+ ;;
+ *)
+ log_failure_msg "Usage: $0 {start|stop|restart|reload|force-reload|status}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
--- icinga-1.0.2.orig/debian/icinga-doc.lintian-overrides
+++ icinga-1.0.2/debian/icinga-doc.lintian-overrides
@@ -0,0 +1 @@
+package-contains-empty-directory usr/share/icinga/htdocs/ssi/
--- icinga-1.0.2.orig/debian/icinga-idoutils.manpages
+++ icinga-1.0.2/debian/icinga-idoutils.manpages
@@ -0,0 +1 @@
+debian/ido2db.8
--- icinga-1.0.2.orig/debian/icinga-dbg.postinst
+++ icinga-1.0.2/debian/icinga-dbg.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+update-alternatives --quiet --install /usr/bin/mini_epn mini_epn /usr/bin/mini_epn_icinga 10 \
+ --slave /usr/share/man/man8/mini_epn.8.gz mini_epn.8.gz /usr/share/man/man8/mini_epn_icinga.8.gz
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/icinga-core.postinst
+++ icinga-1.0.2/debian/icinga-core.postinst
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+#if we stop icinga in icinga.prerm we should also start it here..
+if [ -x "/etc/init.d/icinga" ]; then
+ if ! /etc/init.d/icinga status >/dev/null; then
+
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d icinga start || true
+ else
+ /etc/init.d/icinga start || true
+ fi
+ fi
+fi
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/icinga-cgi.postrm
+++ icinga-1.0.2/debian/icinga-cgi.postrm
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# some shorthands for sanity
+en="/etc/icinga"
+enc="/etc/icinga/objects"
+usn="/usr/share/icinga"
+
+case "$1" in
+ remove)
+ ;;
+ purge)
+ rm -f /etc/icinga/htpasswd.users
+ rm -f /etc/icinga/apache2.conf
+ if which ucf >/dev/null 2>&1; then
+ ucf --purge /etc/icinga/apache2.conf
+ fi
+ ;;
+esac
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/icinga-dbg.manpages
+++ icinga-1.0.2/debian/icinga-dbg.manpages
@@ -0,0 +1 @@
+debian/mini_epn_icinga.8
--- icinga-1.0.2.orig/debian/icinga-common.lintian-overrides
+++ icinga-1.0.2/debian/icinga-common.lintian-overrides
@@ -0,0 +1,2 @@
+non-standard-file-perm etc/icinga/resource.cfg 0600 != 0644
+dir-or-file-in-var-run var/run/icinga/
--- icinga-1.0.2.orig/debian/icinga-common.icinga.default
+++ icinga-1.0.2/debian/icinga-common.icinga.default
@@ -0,0 +1,16 @@
+# /etc/default/icinga
+
+# location of the icinga configuration file
+ICINGACFG="/etc/icinga/icinga.cfg"
+
+# location of the CGI configuration file
+CGICFG="/etc/icinga/cgi.cfg"
+
+# nicelevel to run icinga daemon with
+NICENESS=5
+
+# start ido2db daemon (no/yes)
+IDO2DB=no
+
+# if you use pam_tmpdir, you need to explicitly set TMPDIR:
+#TMPDIR=/tmp
--- icinga-1.0.2.orig/debian/control
+++ icinga-1.0.2/debian/control
@@ -0,0 +1,193 @@
+Source: icinga
+Section: net
+Priority: optional
+Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
+Uploaders: Alexander Wirt <formorer@debian.org>, Jan Wagner <waja@cyconet.org>
+Standards-Version: 3.9.0
+Vcs-Browser: http://git.debian.org/?p=pkg-nagios/icinga.git
+Vcs-Git: git://git.debian.org/pkg-nagios/icinga.git
+Build-Depends: debhelper (>= 7), dpatch (>= 2.0.10), po-debconf, libperl-dev,
+ libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping,
+ autotools-dev, dpkg-dev (>= 1.13.19), libdbi0-dev
+
+Package: icinga-common
+Architecture: all
+Depends: nagios-plugins-basic, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-6), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${misc:Depends}
+Recommends: nagios-plugins
+Description: host and network monitoring system - support files
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+ * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+ TCP port;
+ * plugin interface to allow for user-developed service checks;
+ * contact notifications when problems occur and get resolved (via
+ email, pager, or user-defined method)
+ * support for proactive problem resolution (handlers can be defined to
+ be run during service or host events);
+ * web output: current status, notifications, problem history, log
+ file, etc.
+ .
+ This package contains the common files for all Icinga packages.
+
+Package: icinga-cgi
+Architecture: any
+Depends: icinga-common (= ${source:Version}), coreutils (>= 4.5.3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, adduser, libjs-scriptaculous, libjs-prototype, libjs-mootools
+Recommends: apache2 | httpd, nagios-images (>> 0.1)
+Description: host and network monitoring system - CGI scripts
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+ * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+ TCP port;
+ * plugin interface to allow for user-developed service checks;
+ * contact notifications when problems occur and get resolved (via
+ email, pager, or user-defined method)
+ * support for proactive problem resolution (handlers can be defined to
+ be run during service or host events);
+ * web output: current status, notifications, problem history, log
+ file, etc.
+ .
+ This package provides CGI script files.
+
+Package: icinga-idoutils
+Architecture: any
+Depends: icinga-common (= ${source:Version}), ucf, dbconfig-common, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, lsb-base (>= 3.0-6), libdbd-mysql | libdbd-pgsql
+Recommends: mysql-client | postgresql-client
+Description: host and network monitoring system - icinga-dataobjects support
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+ * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+ TCP port;
+ * plugin interface to allow for user-developed service checks;
+ * contact notifications when problems occur and get resolved (via
+ email, pager, or user-defined method)
+ * support for proactive problem resolution (handlers can be defined to
+ be run during service or host events);
+ * web output: current status, notifications, problem history, log
+ file, etc.
+ .
+ This package contains icinga-dataobjects support which makes it possible
+ to import Icinga status information messages into an SQL database.
+
+Package: icinga
+Architecture: any
+Depends: icinga-core (= ${binary:Version}), icinga-cgi (= ${binary:Version}), ${misc:Depends}
+Suggests: nagios-nrpe-plugin
+Description: monitoring and host and network monitoring system - metapackage
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+ * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+ TCP port;
+ * plugin interface to allow for user-developed service checks;
+ * contact notifications when problems occur and get resolved (via
+ email, pager, or user-defined method)
+ * support for proactive problem resolution (handlers can be defined to
+ be run during service or host events);
+ * web output: current status, notifications, problem history, log
+ file, etc.
+ .
+ This is a metapackage which depends on the Icinga core and the web
+ front-end.
+
+Package: icinga-core
+Architecture: any
+Depends: ${shlibs:Depends}, icinga-common (= ${source:Version}), ${perl:Depends}, ${misc:Depends}
+Suggests: nagios-nrpe-plugin
+Replaces: icinga
+Description: host and network monitoring system - core files
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+ * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+ TCP port;
+ * plugin interface to allow for user-developed service checks;
+ * contact notifications when problems occur and get resolved (via
+ email, pager, or user-defined method)
+ * support for proactive problem resolution (handlers can be defined to
+ be run during service or host events);
+ * web output: current status, notifications, problem history, log
+ file, etc.
+ .
+ This package provides the core of Icinga without the web front-end.
+
+Package: icinga-doc
+Architecture: all
+Section: doc
+Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
+Description: host and network monitoring system - documentation
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+ * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+ TCP port;
+ * plugin interface to allow for user-developed service checks;
+ * contact notifications when problems occur and get resolved (via
+ email, pager, or user-defined method)
+ * support for proactive problem resolution (handlers can be defined to
+ be run during service or host events);
+ * web output: current status, notifications, problem history, log
+ file, etc.
+ .
+ This package provides the documentation for Icinga.
+
+Package: icinga-phpapi
+Architecture: all
+Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, php5 | php5-cgi | php5-cli | libapache2-mod-php5
+Recommends: icinga-idoutils, php5-mysql | php5-pgsql
+Description: host and network monitoring system - PHP API
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+ * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+ TCP port;
+ * plugin interface to allow for user-developed service checks;
+ * contact notifications when problems occur and get resolved (via
+ email, pager, or user-defined method)
+ * support for proactive problem resolution (handlers can be defined to
+ be run during service or host events);
+ * web output: current status, notifications, problem history, log
+ file, etc.
+ .
+ This package provides the API needed to access idoutils and livestatus
+ information from PHP.
+
+Package: icinga-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: icinga-core (= ${binary:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: host and network monitoring system - debug files
+ Icinga is a modular monitoring framework for hosts, services, and
+ networks, based on the Nagios project. It is designed to be easy to
+ understand and modify to fit any need.
+ .
+ Features include:
+ * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
+ TCP port;
+ * plugin interface to allow for user-developed service checks;
+ * contact notifications when problems occur and get resolved (via
+ email, pager, or user-defined method)
+ * support for proactive problem resolution (handlers can be defined to
+ be run during service or host events);
+ * web output: current status, notifications, problem history, log
+ file, etc.
+ .
+ This package provides gdb debugging symbols for the Icinga binaries and
+ the mini_epn tool which can help in debugging Icinga problems.
--- icinga-1.0.2.orig/debian/icinga-idoutils.postrm
+++ icinga-1.0.2/debian/icinga-idoutils.postrm
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+#set -x
+
+if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+fi
+if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+ . /usr/share/dbconfig-common/dpkg/postrm
+ dbc_go icinga-idoutils $@
+fi
+
+if [ "$1" = "purge" ]; then
+ rm -f /etc/icinga/ido2db.cfg
+ ucf --purge /etc/icinga/ido2db.cfg
+ db_purge
+fi
+
+#DEBHELPER#
+
--- icinga-1.0.2.orig/debian/icinga.lintian-overrides
+++ icinga-1.0.2/debian/icinga.lintian-overrides
@@ -0,0 +1 @@
+usr-share-doc-symlink-without-dependency icinga-common
--- icinga-1.0.2.orig/debian/icinga-common.install
+++ icinga-1.0.2/debian/icinga-common.install
@@ -0,0 +1,8 @@
+debian-configs/* /etc/icinga
+debian/resource.cfg /etc/icinga
+debian/conf.d/* /etc/icinga/objects
+sample-config/README /usr/share/doc/icinga-common/examples
+sample-config/*.cfg /usr/share/doc/icinga-common/examples
+sample-config/template-object/README /usr/share/doc/icinga-common/examples/template-object
+sample-config/template-object/*.cfg /usr/share/doc/icinga-common/examples/template-object
+contrib/eventhandlers/* usr/share/icinga/plugins/eventhandlers
--- icinga-1.0.2.orig/debian/icinga-idoutils.README.Debian
+++ icinga-1.0.2/debian/icinga-idoutils.README.Debian
@@ -0,0 +1,25 @@
+icinga-idoutils for Debian
+--------------------------
+
+The idoutils include a Nagios event broker module (idomod.o) that exports
+data from the Icinga daemon. You have to enable it after installing the package
+
+Edit /etc/icinga/icinga.cfg and change or append the following line:
+broker_module=/usr/lib/icinga/idomod.o config_file=/etc/icinga/idomod.cfg
+
+Don't forget to restart Icinga after changing the configuration:
+
+ invoke-rc.d icinga restart
+
+After configuring Icinga to use the idoutils broker module, you have to
+enable the ido2db daemon in /etc/default/icinga by setting
+
+ IDO2DB=yes
+
+and start the daemon
+
+ invoke-rc.d ido2db start
+
+NOTE: If you don't manage your ido2db via debconf adapt /etc/icinga/ido2db.cfg for your need and configure your database before starting the daemon
+
+ -- Alexander Wirt <formorer@debian.org> Wed Mar 17 08:58:44 CET 2010
--- icinga-1.0.2.orig/debian/icinga-common.examples
+++ icinga-1.0.2/debian/icinga-common.examples
@@ -0,0 +1,5 @@
+sample-config/template-object/commands.cfg
+sample-config/template-object/localhost.cfg
+sample-config/resource.cfg
+sample-config/icinga.cfg
+sample-config/cgi.cfg
--- icinga-1.0.2.orig/debian/icinga-cgi.postinst
+++ icinga-1.0.2/debian/icinga-cgi.postinst
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+set -e
+
+# some shorthands for sanity
+en="/etc/icinga"
+enc="/etc/icinga/objects/"
+usn="/usr/share/icinga"
+
+. /usr/share/debconf/confmodule
+. $usn/debian/httpd.webapps-common
+
+if [ -n "$ICINGADEBUG" ]; then
+ echo "now debugging $0 $@"
+ set -x
+fi
+
+# location of the default apache configuration for nagios.
+apacheconf=$en/apache2.conf
+# location of the default htpasswd authentication file.
+htpw=$en/htpasswd.users
+
+setperm() {
+ local user="$1"
+ local group="$2"
+ local mode="$3"
+ local file="$4"
+ shift 4
+ # only do something when no setting exists
+ if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+ chown "$user":"$group" "$file"
+ chmod "$mode" "$file"
+ fi
+}
+
+case "$1" in
+ configure)
+ if ! getent passwd nagios > /dev/null ; then
+ echo 'Adding system-user for nagios' 1>&2
+ adduser --system --group --home /var/lib/nagios \
+ --disabled-login --force-badname nagios > /dev/null
+ fi
+
+ # get the list of selected servers
+ db_get icinga/httpd
+ servers=$(echo $RET | sed -e 's/,/ /g')
+ db_get icinga/adminpassword
+ admpass="$RET"
+
+ ucf --debconf-ok /usr/share/doc/icinga-cgi/examples/apache2.conf $apacheconf
+
+ # configure the web servers, if it is desired
+ if [ "$servers" ]; then
+ if wc_httpd_apache_include $apacheconf icinga $servers; then
+ # reload the selected servers if they are running
+ running_servers="$(wc_httpd_running $servers)"
+ if [ "$running_servers" ]; then
+ wc_httpd_invoke "reload" $running_servers
+ fi
+ fi
+ fi
+
+
+ # we reset the password every run, so if it exists we're running
+ # after being specifically given a password and can unconditionally set it.
+ # XXX there's no way of setting the pw w/out giving it on the cmdline? wtf?
+ if [ -n "$admpass" ]; then
+ touch "$htpw"
+ htpasswd -b "$htpw" icingaadmin "$admpass"
+ fi
+
+ # everything went well, so now let's reset the password
+ db_set icinga/adminpassword ""
+ db_set icinga/adminpassword-repeat ""
+ # ... done with debconf here
+ db_stop
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/ido2db.8.txt
+++ icinga-1.0.2/debian/ido2db.8.txt
@@ -0,0 +1,32 @@
+:man source: Nagios/Icinga
+:man version: {revnumber}
+:man manual: ido2db
+
+ido2db(8)
+==========
+
+NAME
+----
+ido2db - store icinga events and configs in database
+
+SYNOPSIS
+--------
+*ido2db* -c <config_file> [-i] [-f]
+
+DESCRIPTION
+-----------
+Stores Icinga event and configuration data to a database for later retrieval
+and processing. Clients that are capable of sending data to the IDO2DB daemon
+include the LOG2NDO utility and IDOMOD event broker module.
+
+OPTIONS
+-------
+*-i*::
+ Run under INETD/XINETD.
+
+*-f*::
+ Don't daemonize, run in foreground.
+
+AUTHOR
+------
+This manpage was written by Alexander Wirt <formorer@debian.org> for the Debian Distribution.
--- icinga-1.0.2.orig/debian/icinga-idoutils.prerm
+++ icinga-1.0.2/debian/icinga-idoutils.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+#set -x
+
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/prerm
+dbc_go icinga-idoutils $@
+
+#DEBHELPER#
+
--- icinga-1.0.2.orig/debian/icinga-idoutils.install
+++ icinga-1.0.2/debian/icinga-idoutils.install
@@ -0,0 +1 @@
+module/idoutils/config/ido2db.cfg-sample usr/share/icinga/tmpl
--- icinga-1.0.2.orig/debian/icinga-cgi.prerm
+++ icinga-1.0.2/debian/icinga-cgi.prerm
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+
+. /usr/share/icinga/debian/httpd.webapps-common
+
+apacheconf="/etc/icinga/apache2.conf"
+
+if [ -f $apacheconf ]; then
+ case "$1" in
+ remove)
+ # find the configured servers
+ configured_servers=`wc_httpd_apache_configured $apacheconf icinga`
+ if [ "$configured_servers" ]; then
+ # deconfigure them
+ wc_httpd_apache_uninclude $apacheconf icinga $configured_servers
+ # reload the configured servers if they are running
+ running_servers="`wc_httpd_running $configured_servers`"
+ if [ "$running_servers" ]; then
+ wc_httpd_invoke "reload" $running_servers
+ fi
+ fi
+ ;;
+ esac
+fi
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/apache2.conf
+++ icinga-1.0.2/debian/apache2.conf
@@ -0,0 +1,25 @@
+# apache configuration for icinga
+
+ScriptAlias /cgi-bin/icinga /usr/lib/cgi-bin/icinga
+ScriptAlias /icinga/cgi-bin /usr/lib/cgi-bin/icinga
+
+# Where the stylesheets (config files) reside
+Alias /icinga/stylesheets /etc/icinga/stylesheets
+
+# Where the HTML pages live
+Alias /icinga /usr/share/icinga/htdocs
+
+<DirectoryMatch (/usr/share/icinga/htdocs|/usr/lib/cgi-bin/icinga|/etc/icinga/stylesheets)>
+ Options FollowSymLinks
+
+ DirectoryIndex index.html
+
+ AllowOverride AuthConfig
+ Order Allow,Deny
+ Allow From All
+
+ AuthName "Icinga Access"
+ AuthType Basic
+ AuthUserFile /etc/icinga/htpasswd.users
+ require valid-user
+</DirectoryMatch>
--- icinga-1.0.2.orig/debian/icinga-doc.install
+++ icinga-1.0.2/debian/icinga-doc.install
@@ -0,0 +1 @@
+usr/share/icinga/htdocs/docs
--- icinga-1.0.2.orig/debian/icinga-common.dirs
+++ icinga-1.0.2/debian/icinga-common.dirs
@@ -0,0 +1,11 @@
+etc/init.d
+etc/icinga
+etc/icinga/objects
+usr/share/icinga/plugins/eventhandlers
+var/lib/icinga/rw
+var/lib/icinga/spool
+var/lib/icinga/spool/checkresults
+var/log/icinga/archives
+var/run/icinga
+var/cache/icinga
+usr/share/icinga/debian
--- icinga-1.0.2.orig/debian/icinga-core.manpages
+++ icinga-1.0.2/debian/icinga-core.manpages
@@ -0,0 +1,2 @@
+debian/icinga.8
+debian/icingastats.8
--- icinga-1.0.2.orig/debian/icinga-idoutils.postinst
+++ icinga-1.0.2/debian/icinga-idoutils.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+#set -x
+
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/postinst
+dbc_generate_include='template:/etc/icinga/ido2db.cfg'
+dbc_generate_include_owner='nagios:nagios'
+dbc_generate_include_args='--ucf -o template_infile=/usr/share/icinga/tmpl/ido2db.cfg-sample'
+dbc_go icinga-idoutils $@
+
+#DEBHELPER#
+
--- icinga-1.0.2.orig/debian/icinga-cgi.install
+++ icinga-1.0.2/debian/icinga-cgi.install
@@ -0,0 +1,12 @@
+debian/httpd.webapps-common /usr/share/icinga/debian
+debian-configs/cgi.cfg /etc/icinga
+usr/share/icinga/htdocs/*.html
+usr/share/icinga/htdocs/media
+usr/share/icinga/htdocs/contexthelp
+usr/share/icinga/htdocs/robots.txt
+usr/share/icinga/htdocs/images
+usr/lib/cgi-bin/*
+usr/share/icinga/htdocs/stylesheets/* /etc/icinga/stylesheets/
+usr/share/icinga/htdocs/js/*
+usr/share/icinga/htdocs/getList.php
+usr/share/icinga/htdocs/includes/utils.inc.php
--- icinga-1.0.2.orig/debian/icinga-common.links
+++ icinga-1.0.2/debian/icinga-common.links
@@ -0,0 +1 @@
+usr/share/icinga/htdocs/docs usr/share/doc/icinga-common/html
--- icinga-1.0.2.orig/debian/mini_epn_icinga.8
+++ icinga-1.0.2/debian/mini_epn_icinga.8
@@ -0,0 +1,44 @@
+'\" t
+.\" Title: mini_epn
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\" Date: 09/19/2009
+.\" Manual: mini_epn
+.\" Source: Nagios/Icinga
+.\" Language: English
+.\"
+.TH "MINI_EPN" "8" "09/19/2009" "Nagios/Icinga" "mini_epn"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+mini_epn \- too to nagios/icingaplugins inside of an embedded perl interpreter
+.SH "SYNOPSIS"
+.sp
+\fBmini_epn\fR
+.SH "DESCRIPTION"
+.sp
+After calling \fBmini_epn\fR an embedded perl interpreter gets started and asks for you a script to execute under the interpreter\&. To exit the interpreter loop press ^d at the prompt\&.
+.SH "EXAMPLES"
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+# mini_epn
+Enter file name: /usr/lib/nagios/plugins/check_linux_raid
+embedded perl plugin return code and output was: 0 & \'OK md0 status=[UU]\&. md1 status=[UU]\&.
+.fi
+.if n \{\
+.RE
+.\}
+.SH "AUTHOR"
+.sp
+This manpage was written by Alexander Wirt <formorer@debian\&.org> for the Debian Distribution\&.
--- icinga-1.0.2.orig/debian/icinga-common.postrm
+++ icinga-1.0.2/debian/icinga-common.postrm
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+# some shorthands for sanity
+en="/etc/icinga"
+enc="/etc/icinga/objetcs"
+usn="/usr/share/icinga"
+
+case "$1" in
+ remove)
+ ;;
+ purge)
+ for file in $en/resource.cfg /var/log/icinga /var/run/icinga \
+ /var/lib/icinga /var/lib/icinga/spool \
+ /var/lib/icinga/spool/checkresults \
+ /var/cache/icinga /var/lib/icinga/rw; do
+ dpkg-statoverride --force --remove $file 2>/dev/null || true
+ done
+ rm -rf /var/run/icinga /var/log/icinga /var/lib/icinga \
+ /var/cache/icinga
+ ;;
+esac
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/resource.cfg
+++ icinga-1.0.2/debian/resource.cfg
@@ -0,0 +1,31 @@
+###########################################################################
+#
+# RESOURCE.CFG - Resource File for Icinga
+#
+# You can define $USERx$ macros in this file, which can in turn be used
+# in command definitions in your host config file(s). $USERx$ macros are
+# useful for storing sensitive information such as usernames, passwords,
+# etc. They are also handy for specifying the path to plugins and
+# event handlers - if you decide to move the plugins or event handlers to
+# a different directory in the future, you can just update one or two
+# $USERx$ macros, instead of modifying a lot of command definitions.
+#
+# The CGIs will not attempt to read the contents of resource files, so
+# you can set restrictive permissions (600 or 660) on them.
+#
+# Icinga supports up to 32 $USERx$ macros ($USER1$ through $USER32$)
+#
+# Resource files may also be used to store configuration directives for
+# external data sources like MySQL...
+#
+###########################################################################
+
+# Sets $USER1$ to be the path to the plugins
+$USER1$=/usr/lib/nagios/plugins
+
+# Sets $USER2$ to be the path to event handlers
+#$USER2$=/usr/lib/icinga/plugins/eventhandlers
+
+# Store some usernames and passwords (hidden from the CGIs)
+#$USER3$=someuser
+#$USER4$=somepassword
--- icinga-1.0.2.orig/debian/icinga-idoutils.dirs
+++ icinga-1.0.2/debian/icinga-idoutils.dirs
@@ -0,0 +1,3 @@
+etc/icinga
+usr/lib/icinga
+usr/share/dbconfig-common/data/icinga-idoutils/install/
--- icinga-1.0.2.orig/debian/icinga-cgi.templates
+++ icinga-1.0.2/debian/icinga-cgi.templates
@@ -0,0 +1,39 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: icinga/httpd
+Type: multiselect
+Choices: apache2
+Default: apache2
+_Description: Apache servers to configure for icinga:
+ Please select which Apache servers should be configured for icinga.
+ .
+ If you would prefer to perform configuration manually, leave all
+ servers unselected.
+
+Template: icinga/adminpassword
+Type: password
+_Description: Icinga web administration password:
+ Please provide the password to be created with the "icingaadmin" user.
+ .
+ This is the username and password to use when connecting to the Icinga
+ server after completing the configuration. If you do not provide
+ a password, you will have to configure access to Icinga manually
+ later on.
+
+Template: icinga/adminpassword-repeat
+Type: password
+_Description: Re-enter password to verify:
+ Please enter the same user password again to verify you have typed it
+ correctly.
+
+Template: icinga/adminpassword-mismatch
+Type: error
+_Description: Password input error
+ The two passwords you entered were not the same. Please try again.
--- icinga-1.0.2.orig/debian/icinga-cgi.dirs
+++ icinga-1.0.2/debian/icinga-cgi.dirs
@@ -0,0 +1,3 @@
+etc/icinga/stylesheets
+usr/share/icinga/htdocs/ssi
+usr/lib/cgi-bin
--- icinga-1.0.2.orig/debian/icinga-common.postinst
+++ icinga-1.0.2/debian/icinga-common.postinst
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+set -e
+
+# some shorthands for sanity
+en="/etc/icinga"
+enc="/etc/icinga/objects"
+usn="/usr/share/icinga"
+
+. /usr/share/debconf/confmodule
+
+if [ -n "$ICINGADEBUG" ]; then
+ echo "now debugging $0 $@"
+ set -x
+fi
+
+setperm() {
+ local user="$1"
+ local group="$2"
+ local mode="$3"
+ local file="$4"
+ shift 4
+ # only do something when no setting exists
+ if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+ chown "$user":"$group" "$file"
+ chmod "$mode" "$file"
+ fi
+}
+
+case "$1" in
+ configure)
+ if ! getent passwd nagios > /dev/null ; then
+ echo 'Adding system-user for nagios' 1>&2
+ adduser --system --group --home /var/lib/nagios \
+ --disabled-login --force-badname nagios > /dev/null
+ fi
+
+ # explicitly set permissions on some files that are dependent
+ # on the uid/gid of the nagios user, which is dynamically created.
+ setperm root nagios 0640 $en/resource.cfg
+ setperm nagios adm 2751 /var/log/icinga
+ setperm nagios adm 2751 /var/log/icinga/archives
+ setperm nagios nagios 0750 /var/run/icinga
+ setperm nagios nagios 0750 /var/lib/icinga/spool
+ setperm nagios nagios 0755 /var/lib/icinga
+ setperm nagios nagios 0750 /var/lib/icinga/spool/checkresults
+ setperm nagios www-data 02750 /var/cache/icinga
+ setperm nagios www-data 0700 /var/lib/icinga/rw
+
+ db_stop
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
--- icinga-1.0.2.orig/debian/icinga-doc.links
+++ icinga-1.0.2/debian/icinga-doc.links
@@ -0,0 +1,2 @@
+usr/share/icinga/htdocs/docs usr/share/doc/icinga-doc/html
+etc/icinga/stylesheets usr/share/icinga/stylesheets
--- icinga-1.0.2.orig/debian/icinga.links
+++ icinga-1.0.2/debian/icinga.links
@@ -0,0 +1 @@
+usr/share/doc/icinga-common usr/share/doc/icinga
--- icinga-1.0.2.orig/debian/icinga-doc.doc-base
+++ icinga-1.0.2/debian/icinga-doc.doc-base
@@ -0,0 +1,9 @@
+Document: icinga
+Title: Icinga Documentation
+Author: Ethan Galstad
+Abstract: Icinga user and administrator's documentation
+Section: Network/Monitoring
+
+Format: HTML
+Index: /usr/share/icinga/htdocs/docs/index.html
+Files: /usr/share/icinga/htdocs/docs/*.html
--- icinga-1.0.2.orig/debian/icinga-cgi.links
+++ icinga-1.0.2/debian/icinga-cgi.links
@@ -0,0 +1,6 @@
+usr/share/javascript/mootools/mootools.js usr/share/icinga/htdocs/js/mootools.js
+usr/share/javascript/prototype/prototype.js usr/share/icinga/htdocs/js/prototype.js
+usr/share/javascript/scriptaculous/scriptaculous.js usr/share/icinga/htdocs/js/scriptaculous.js
+usr/share/javascript/scriptaculous/builder.js usr/share/icinga/htdocs/js/builder.js
+usr/share/javascript/scriptaculous/slider.js usr/share/icinga/htdocs/js/slider.js
+usr/share/javascript/scriptaculous/dragdrop.js usr/share/icinga/htdocs/js/dragdrop.js
--- icinga-1.0.2.orig/debian/conf.d/hostgroups_icinga.cfg
+++ icinga-1.0.2/debian/conf.d/hostgroups_icinga.cfg
@@ -0,0 +1,31 @@
+# Some generic hostgroup definitions
+
+# A simple wildcard hostgroup
+define hostgroup {
+ hostgroup_name all
+ alias All Servers
+ members *
+ }
+
+# A list of your Debian GNU/Linux servers
+define hostgroup {
+ hostgroup_name debian-servers
+ alias Debian GNU/Linux Servers
+ members localhost
+ }
+
+# A list of your web servers
+define hostgroup {
+ hostgroup_name http-servers
+ alias HTTP servers
+ members localhost
+ }
+
+# A list of your ssh-accessible servers
+define hostgroup {
+ hostgroup_name ssh-servers
+ alias SSH servers
+ members localhost
+ }
+
+
--- icinga-1.0.2.orig/debian/conf.d/contacts_icinga.cfg
+++ icinga-1.0.2/debian/conf.d/contacts_icinga.cfg
@@ -0,0 +1,46 @@
+###############################################################################
+# contacts.cfg
+###############################################################################
+
+
+
+###############################################################################
+###############################################################################
+#
+# CONTACTS
+#
+###############################################################################
+###############################################################################
+
+# In this simple config file, a single contact will receive all alerts.
+
+define contact{
+ contact_name root
+ alias Root
+ service_notification_period 24x7
+ host_notification_period 24x7
+ service_notification_options w,u,c,r
+ host_notification_options d,r
+ service_notification_commands notify-service-by-email
+ host_notification_commands notify-host-by-email
+ email root@localhost
+ }
+
+
+
+###############################################################################
+###############################################################################
+#
+# CONTACT GROUPS
+#
+###############################################################################
+###############################################################################
+
+# We only have one contact in this simple configuration file, so there is
+# no need to create more than one contact group.
+
+define contactgroup{
+ contactgroup_name admins
+ alias Nagios Administrators
+ members root
+ }
--- icinga-1.0.2.orig/debian/conf.d/localhost_icinga.cfg
+++ icinga-1.0.2/debian/conf.d/localhost_icinga.cfg
@@ -0,0 +1,59 @@
+# A simple configuration file for monitoring the local host
+# This can serve as an example for configuring other servers;
+# Custom services specific to this host are added here, but services
+# defined in icinga-common_services.cfg may also apply.
+#
+
+define host{
+ use generic-host ; Name of host template to use
+ host_name localhost
+ alias localhost
+ address 127.0.0.1
+ }
+
+# Define a service to check the disk space of the root partition
+# on the local machine. Warning if < 20% free, critical if
+# < 10% free space on partition.
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description Disk Space
+ check_command check_all_disks!20%!10%
+ }
+
+
+
+# Define a service to check the number of currently logged in
+# users on the local machine. Warning if > 20 users, critical
+# if > 50 users.
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description Current Users
+ check_command check_users!20!50
+ }
+
+
+# Define a service to check the number of currently running procs
+# on the local machine. Warning if > 250 processes, critical if
+# > 400 processes.
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description Total Processes
+ check_command check_procs!250!400
+ }
+
+
+
+# Define a service to check the load on the local machine.
+
+define service{
+ use generic-service ; Name of service template to use
+ host_name localhost
+ service_description Current Load
+ check_command check_load!5.0!4.0!3.0!10.0!6.0!4.0
+ }
--- icinga-1.0.2.orig/debian/conf.d/services_icinga.cfg
+++ icinga-1.0.2/debian/conf.d/services_icinga.cfg
@@ -0,0 +1,17 @@
+# check that web services are running
+define service {
+ hostgroup_name http-servers
+ service_description HTTP
+ check_command check_http
+ use generic-service
+ notification_interval 0 ; set > 0 if you want to be renotified
+}
+
+# check that ssh services are running
+define service {
+ hostgroup_name ssh-servers
+ service_description SSH
+ check_command check_ssh
+ use generic-service
+ notification_interval 0 ; set > 0 if you want to be renotified
+}
--- icinga-1.0.2.orig/debian/conf.d/generic-host_icinga.cfg
+++ icinga-1.0.2/debian/conf.d/generic-host_icinga.cfg
@@ -0,0 +1,19 @@
+# Generic host definition template - This is NOT a real host, just a template!
+
+define host{
+ name generic-host ; The name of this host template
+ notifications_enabled 1 ; Host notifications are enabled
+ event_handler_enabled 1 ; Host event handler is enabled
+ flap_detection_enabled 1 ; Flap detection is enabled
+ failure_prediction_enabled 1 ; Failure prediction is enabled
+ process_perf_data 1 ; Process performance data
+ retain_status_information 1 ; Retain status information across program restarts
+ retain_nonstatus_information 1 ; Retain non-status information across program restarts
+ check_command check-host-alive
+ max_check_attempts 10
+ notification_interval 0
+ notification_period 24x7
+ notification_options d,u,r
+ contact_groups admins
+ register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
+ }
--- icinga-1.0.2.orig/debian/conf.d/generic-service_icinga.cfg
+++ icinga-1.0.2/debian/conf.d/generic-service_icinga.cfg
@@ -0,0 +1,26 @@
+# generic service template definition
+define service{
+ name generic-service ; The 'name' of this service template
+ active_checks_enabled 1 ; Active service checks are enabled
+ passive_checks_enabled 1 ; Passive service checks are enabled/accepted
+ parallelize_check 1 ; Active service checks should be parallelized (disabling this can lead to major performance problems)
+ obsess_over_service 1 ; We should obsess over this service (if necessary)
+ check_freshness 0 ; Default is to NOT check service 'freshness'
+ notifications_enabled 1 ; Service notifications are enabled
+ event_handler_enabled 1 ; Service event handler is enabled
+ flap_detection_enabled 1 ; Flap detection is enabled
+ failure_prediction_enabled 1 ; Failure prediction is enabled
+ process_perf_data 1 ; Process performance data
+ retain_status_information 1 ; Retain status information across program restarts
+ retain_nonstatus_information 1 ; Retain non-status information across program restarts
+ notification_interval 0 ; Only send notifications on status change by default.
+ is_volatile 0
+ check_period 24x7
+ normal_check_interval 5
+ retry_check_interval 1
+ max_check_attempts 4
+ notification_period 24x7
+ notification_options w,u,c,r
+ contact_groups admins
+ register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
+ }
--- icinga-1.0.2.orig/debian/conf.d/timeperiods_icinga.cfg
+++ icinga-1.0.2/debian/conf.d/timeperiods_icinga.cfg
@@ -0,0 +1,50 @@
+###############################################################################
+# timeperiods.cfg
+###############################################################################
+
+# This defines a timeperiod where all times are valid for checks,
+# notifications, etc. The classic "24x7" support nightmare. :-)
+
+define timeperiod{
+ timeperiod_name 24x7
+ alias 24 Hours A Day, 7 Days A Week
+ sunday 00:00-24:00
+ monday 00:00-24:00
+ tuesday 00:00-24:00
+ wednesday 00:00-24:00
+ thursday 00:00-24:00
+ friday 00:00-24:00
+ saturday 00:00-24:00
+ }
+
+# Here is a slightly friendlier period during work hours
+define timeperiod{
+ timeperiod_name workhours
+ alias Standard Work Hours
+ monday 09:00-17:00
+ tuesday 09:00-17:00
+ wednesday 09:00-17:00
+ thursday 09:00-17:00
+ friday 09:00-17:00
+ }
+
+# The complement of workhours
+define timeperiod{
+ timeperiod_name nonworkhours
+ alias Non-Work Hours
+ sunday 00:00-24:00
+ monday 00:00-09:00,17:00-24:00
+ tuesday 00:00-09:00,17:00-24:00
+ wednesday 00:00-09:00,17:00-24:00
+ thursday 00:00-09:00,17:00-24:00
+ friday 00:00-09:00,17:00-24:00
+ saturday 00:00-24:00
+ }
+
+# This one is a favorite: never :)
+define timeperiod{
+ timeperiod_name never
+ alias Never
+ }
+
+# end of file
--- icinga-1.0.2.orig/debian/conf.d/extinfo_icinga.cfg
+++ icinga-1.0.2/debian/conf.d/extinfo_icinga.cfg
@@ -0,0 +1,13 @@
+##
+## Extended Host and Service Information
+##
+
+define hostextinfo{
+ hostgroup_name debian-servers
+ notes Debian GNU/Linux servers
+# notes_url http://webserver.localhost.localdomain/hostinfo.pl?host=netware1
+ icon_image base/debian.png
+ icon_image_alt Debian GNU/Linux
+ vrml_image debian.png
+ statusmap_image base/debian.gd2
+ }
--- icinga-1.0.2.orig/debian/patches/52_icinga.cfg-debianize.dpatch
+++ icinga-1.0.2/debian/patches/52_icinga.cfg-debianize.dpatch
@@ -0,0 +1,152 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_icinga.cfg-debianize.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: debianize the icinga config
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/sample-config/icinga.cfg.in icinga-1.0.2~pre20100626/sample-config/icinga.cfg.in
+--- icinga-1.0.2~pre20100626~/sample-config/icinga.cfg.in 2010-06-25 13:12:03.000000000 +0200
++++ icinga-1.0.2~pre20100626/sample-config/icinga.cfg.in 2010-06-26 11:04:54.346507849 +0200
+@@ -14,9 +14,20 @@
+ # for historical purposes. This should be the first option specified
+ # in the config file!!!
+
+-log_file=@localstatedir@/icinga.log
++log_file=/var/log/icinga/icinga.log
++
++
++# Commands definitions
++cfg_file=/etc/icinga/commands.cfg
+
++# Debian also defaults to using the check commands defined by the debian
++# nagios-plugins package
++cfg_dir=/etc/nagios-plugins/config
+
++# Debian uses by default a configuration directory where icinga-common,
++# other packages and the local admin can dump or link configuration
++# files into.
++cfg_dir=/etc/icinga/objects/
+
+ # OBJECT CONFIGURATION FILE(S)
+ # These are the object configuration files in which you define hosts,
+@@ -25,13 +36,11 @@
+ # if you wish (as shown below), or keep them all in a single config file.
+
+ # You can specify individual object config files as shown below:
+-cfg_file=@sysconfdir@/objects/commands.cfg
+-cfg_file=@sysconfdir@/objects/contacts.cfg
+-cfg_file=@sysconfdir@/objects/timeperiods.cfg
+-cfg_file=@sysconfdir@/objects/templates.cfg
+
+-# Definitions for monitoring the local (Linux) host
+-cfg_file=@sysconfdir@/objects/localhost.cfg
++#cfg_file=@sysconfdir@/objects/commands.cfg
++#cfg_file=@sysconfdir@/objects/contacts.cfg
++#cfg_file=@sysconfdir@/objects/timeperiods.cfg
++#cfg_file=@sysconfdir@/objects/templates.cfg
+
+ # Definitions for monitoring a Windows machine
+ #cfg_file=@sysconfdir@/objects/windows.cfg
+@@ -62,7 +71,7 @@
+ # directly) in order to prevent inconsistencies that can occur
+ # when the config files are modified after Icinga starts.
+
+-object_cache_file=@localstatedir@/objects.cache
++object_cache_file=/var/cache/icinga/objects.cache
+
+
+
+@@ -78,7 +87,7 @@
+ # Read the documentation section on optimizing Icinga to find our more
+ # about how this feature works.
+
+-precached_object_file=@localstatedir@/objects.precache
++precached_object_file=/var/cache/icinga/objects.precache
+
+
+
+@@ -138,7 +147,7 @@
+ # you will have to enable this.
+ # Values: 0 = disable commands, 1 = enable commands
+
+-check_external_commands=1
++check_external_commands=0
+
+
+
+@@ -167,6 +176,8 @@
+ # is running as (usually 'nobody'). Permissions should be set at the
+ # directory level instead of on the file, as the file is deleted every
+ # time its contents are processed.
++# Debian Users: In case you didn't read README.Debian yet, _NOW_ is the
++# time to do it.
+
+ command_file=@localstatedir@/rw/icinga.cmd
+
+@@ -196,7 +207,7 @@
+ # is created, used, and deleted throughout the time that Icinga is
+ # running.
+
+-temp_file=@localstatedir@/icinga.tmp
++temp_file=/var/cache/icinga/icinga.tmp
+
+
+
+@@ -244,7 +255,8 @@
+ #broker_module=/somewhere/module2.o arg1 arg2=3 debug=0
+
+ # Uncomment this to enable idomod.o
+-#broker_module=@bindir@/idomod.o config_file=@sysconfdir@/idomod.cfg
++# Don't forget to also enable the daemon in /etc/default/icinga
++#broker_module=/usr/lib/icinga/idomod.o config_file=@sysconfdir@/idomod.cfg
+
+
+
+@@ -265,7 +277,7 @@
+ # This is the directory where archived (rotated) log files should be
+ # placed (assuming you've chosen to do log rotation).
+
+-log_archive_path=@localstatedir@/archives
++log_archive_path=/var/log/icinga/archives
+
+
+
+@@ -1142,7 +1154,7 @@
+ # strict-iso8601 (YYYY-MM-DDTHH:MM:SS)
+ #
+
+-date_format=us
++date_format=iso8601
+
+
+
+@@ -1172,7 +1184,7 @@
+ # embedded Perl interpreter) is located. If you didn't compile
+ # Icinga with embedded Perl support, this option has no effect.
+
+-p1_file=@bindir@/p1.pl
++p1_file=/usr/lib/icinga/p1.pl
+
+
+
+@@ -1256,8 +1268,8 @@
+ # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
+ # commands.
+
+-admin_email=@icinga_user@@localhost
+-admin_pager=page@icinga_user@@localhost
++admin_email=root@localhost
++admin_pager=pageroot@localhost
+
+
+
+@@ -1364,7 +1376,7 @@
+ # DEBUG FILE
+ # This option determines where Icinga should write debugging information.
+
+-debug_file=@localstatedir@/icinga.debug
++debug_file=/var/log/icinga/icinga.debug
+
+
+
--- icinga-1.0.2.orig/debian/patches/30_fix_p1_debug_path.dpatch
+++ icinga-1.0.2/debian/patches/30_fix_p1_debug_path.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_fix_p1_debug_path.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adapt paths in p1.pl
+
+@DPATCH@
+diff -urNad nagios3-3.0.1~/p1.pl nagios3-3.0.1/p1.pl
+--- nagios3-3.0.1~/p1.pl 2007-12-26 18:52:04.000000000 +0100
++++ nagios3-3.0.1/p1.pl 2008-05-04 12:55:48.000000000 +0200
+@@ -16,7 +16,7 @@
+ # use constant DEBUG_LEVEL => LEAVE_MSG | CACHE_DUMP ;
+ # use constant DEBUG_LEVEL => LEAVE_MSG | CACHE_DUMP | PLUGIN_DUMP ;
+
+-use constant DEBUG_LOG_PATH => '/usr/local/nagios/var/' ;
++use constant DEBUG_LOG_PATH => '/var/log/nagios3/' ;
+ # use constant DEBUG_LOG_PATH => './' ;
+ use constant LEAVE_MSG_STREAM => DEBUG_LOG_PATH . 'epn_leave-msgs.log' ;
+ use constant CACHE_DUMP_STREAM => DEBUG_LOG_PATH . 'epn_cache-dump.log' ;
--- icinga-1.0.2.orig/debian/patches/51_commands.cfg-debianize.dpatch
+++ icinga-1.0.2/debian/patches/51_commands.cfg-debianize.dpatch
@@ -0,0 +1,228 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51_commands.cfg-debianize.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: debianize command.cfg
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/sample-config/template-object/commands.cfg.in icinga-1.0.2~pre20100626/sample-config/template-object/commands.cfg.in
+--- icinga-1.0.2~pre20100626~/sample-config/template-object/commands.cfg.in 2010-06-25 13:12:03.000000000 +0200
++++ icinga-1.0.2~pre20100626/sample-config/template-object/commands.cfg.in 2010-06-26 11:02:03.026527280 +0200
+@@ -1,24 +1,19 @@
+ ###############################################################################
+ # COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR ICINGA
+-#
+ # NOTES: This config file provides you with some example command definitions
+ # that you can reference in host, service, and contact definitions.
+ #
+ # You don't need to keep commands in a separate file from your other
+ # object definitions. This has been done just to make things easier to
+ # understand.
+-#
+ ###############################################################################
+
+
+ ################################################################################
+-#
+ # SAMPLE NOTIFICATION COMMANDS
+-#
+ # These are some example notification commands. They may or may not work on
+ # your system without modification. As an example, some systems will require
+ # you to use "/usr/bin/mailx" instead of "/usr/bin/mail" in the commands below.
+-#
+ ################################################################################
+
+
+@@ -34,191 +29,8 @@
+ command_line /usr/bin/printf "%b" "***** Icinga *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | @MAIL_PROG@ -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+ }
+
+-
+-
+-
+-
+-################################################################################
+-#
+-# SAMPLE HOST CHECK COMMANDS
+-#
+-################################################################################
+-
+-
+-# This command checks to see if a host is "alive" by pinging it
+-# The check must result in a 100% packet loss or 5 second (5000ms) round trip
+-# average time to produce a critical error.
+-# Note: Five ICMP echo packets are sent (determined by the '-p 5' argument)
+-
+-# 'check-host-alive' command definition
+-define command{
+- command_name check-host-alive
+- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5
+- }
+-
+-
+-
+-
+-################################################################################
+-#
+-# SAMPLE SERVICE CHECK COMMANDS
+-#
+-# These are some example service check commands. They may or may not work on
+-# your system, as they must be modified for your plugins. See the HTML
+-# documentation on the plugins for examples of how to configure command definitions.
+-#
+-# NOTE: The following 'check_local_...' functions are designed to monitor
+-# various metrics on the host that Icinga is running on (i.e. this one).
+-################################################################################
+-
+-# 'check_local_disk' command definition
+-define command{
+- command_name check_local_disk
+- command_line $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+- }
+-
+-
+-# 'check_local_load' command definition
+-define command{
+- command_name check_local_load
+- command_line $USER1$/check_load -w $ARG1$ -c $ARG2$
+- }
+-
+-
+-# 'check_local_procs' command definition
+-define command{
+- command_name check_local_procs
+- command_line $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
+- }
+-
+-
+-# 'check_local_users' command definition
+-define command{
+- command_name check_local_users
+- command_line $USER1$/check_users -w $ARG1$ -c $ARG2$
+- }
+-
+-
+-# 'check_local_swap' command definition
+-define command{
+- command_name check_local_swap
+- command_line $USER1$/check_swap -w $ARG1$ -c $ARG2$
+- }
+-
+-
+-# 'check_local_mrtgtraf' command definition
+-define command{
+- command_name check_local_mrtgtraf
+- command_line $USER1$/check_mrtgtraf -F $ARG1$ -a $ARG2$ -w $ARG3$ -c $ARG4$ -e $ARG5$
+- }
+-
+-
+-################################################################################
+-# NOTE: The following 'check_...' commands are used to monitor services on
+-# both local and remote hosts.
+-################################################################################
+-
+-# 'check_ftp' command definition
+-define command{
+- command_name check_ftp
+- command_line $USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$
+- }
+-
+-
+-# 'check_hpjd' command definition
+-define command{
+- command_name check_hpjd
+- command_line $USER1$/check_hpjd -H $HOSTADDRESS$ $ARG1$
+- }
+-
+-
+-# 'check_snmp' command definition
+-define command{
+- command_name check_snmp
+- command_line $USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$
+- }
+-
+-
+-# 'check_http' command definition
+-define command{
+- command_name check_http
+- command_line $USER1$/check_http -I $HOSTADDRESS$ $ARG1$
+- }
+-
+-
+-# 'check_ssh' command definition
+-define command{
+- command_name check_ssh
+- command_line $USER1$/check_ssh $ARG1$ $HOSTADDRESS$
+- }
+-
+-
+-# 'check_dhcp' command definition
+-define command{
+- command_name check_dhcp
+- command_line $USER1$/check_dhcp $ARG1$
+- }
+-
+-
+-# 'check_ping' command definition
+-define command{
+- command_name check_ping
+- command_line $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5
+- }
+-
+-
+-# 'check_pop' command definition
+-define command{
+- command_name check_pop
+- command_line $USER1$/check_pop -H $HOSTADDRESS$ $ARG1$
+- }
+-
+-
+-# 'check_imap' command definition
+-define command{
+- command_name check_imap
+- command_line $USER1$/check_imap -H $HOSTADDRESS$ $ARG1$
+- }
+-
+-
+-# 'check_smtp' command definition
+-define command{
+- command_name check_smtp
+- command_line $USER1$/check_smtp -H $HOSTADDRESS$ $ARG1$
+- }
+-
+-
+-# 'check_tcp' command definition
+-define command{
+- command_name check_tcp
+- command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
+- }
+-
+-
+-# 'check_udp' command definition
+-define command{
+- command_name check_udp
+- command_line $USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$
+- }
+-
+-
+-# 'check_nt' command definition
+-define command{
+- command_name check_nt
+- command_line $USER1$/check_nt -H $HOSTADDRESS$ -p 12489 -v $ARG1$ $ARG2$
+- }
+-
+-
+-
+ ################################################################################
+-#
+-# SAMPLE PERFORMANCE DATA COMMANDS
+-#
+-# These are sample performance data commands that can be used to send performance
+-# data output to two text files (one for hosts, another for services). If you
+-# plan on simply writing performance data out to a file, consider using the
+-# host_perfdata_file and service_perfdata_file options in the main config file.
+-#
++# PERFORMANCE DATA COMMANDS
+ ################################################################################
+
+
--- icinga-1.0.2.orig/debian/patches/91_fix-copy-paste-error-569.dpatch
+++ icinga-1.0.2/debian/patches/91_fix-copy-paste-error-569.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_fix-copy-paste-error-569.dpatch by Christoph Maser <cmr@financial.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't overwrite temp_path if it is before check_result_path in config
+
+@DPATCH@
+
+
+diff --git a/base/config.c b/base/config.c
+index a2ec628..104853d 100644
+--- a/base/config.c
++++ b/base/config.c
+@@ -446,16 +446,13 @@ int read_main_config_file(char *main_config_file){
+ }
+ closedir(tmpdir);
+
+- my_free(temp_path);
+- if((temp_path=(char *)strdup(value))){
+- strip(temp_path);
++ my_free(check_result_path);
++ if((check_result_path=(char *)strdup(value))){
++ strip(check_result_path);
+ /* make sure we don't have a trailing slash */
+- if(temp_path[strlen(temp_path)-1]=='/')
+- temp_path[strlen(temp_path)-1]='\x0';
++ if(check_result_path[strlen(check_result_path)-1]=='/')
++ check_result_path[strlen(check_result_path)-1]='\x0';
+ }
+-
+- my_free(check_result_path);
+- check_result_path=(char *)strdup(temp_path);
+ }
+
+ else if(!strcmp(variable,"max_check_result_file_age"))
+--
+1.7.1
+
--- icinga-1.0.2.orig/debian/patches/55_idoutils-debianize.dpatch
+++ icinga-1.0.2/debian/patches/55_idoutils-debianize.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_idoutils-debianize.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: debianize idoutils
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/module/idoutils/config/ido2db.cfg-sample.in icinga-1.0.2~pre20100626/module/idoutils/config/ido2db.cfg-sample.in
+--- icinga-1.0.2~pre20100626~/module/idoutils/config/ido2db.cfg-sample.in 2010-06-25 13:12:03.000000000 +0200
++++ icinga-1.0.2~pre20100626/module/idoutils/config/ido2db.cfg-sample.in 2010-06-26 11:07:09.473927242 +0200
+@@ -8,7 +8,7 @@
+ # This is the lockfile that IDO2DB will use to store its PID number
+ # in when it is running in daemon mode.
+
+-lock_file=@localstatedir@/ido2db.lock
++lock_file=/var/run/icinga/ido2db.pid
+
+
+
+@@ -236,7 +236,7 @@
+ # DEBUG FILE
+ # This option determines where the daemon should write debugging information.
+
+-debug_file=@localstatedir@/ido2db.debug
++debug_file=/var/log/icinga/ido2db.debug
+
+
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~pre20100626~/module/idoutils/config/idomod.cfg-sample.in icinga-1.0.2~pre20100626/module/idoutils/config/idomod.cfg-sample.in
+--- icinga-1.0.2~pre20100626~/module/idoutils/config/idomod.cfg-sample.in 2010-06-25 13:12:03.000000000 +0200
++++ icinga-1.0.2~pre20100626/module/idoutils/config/idomod.cfg-sample.in 2010-06-26 11:07:09.473927242 +0200
+@@ -229,7 +229,7 @@
+ # DEBUG FILE
+ # This option determines where the daemon should write debugging information.
+
+-debug_file=@localstatedir@/idomod.debug
++debug_file=/var/log/icinga/idomod.debug
+
+
+
--- icinga-1.0.2.orig/debian/patches/93_execvp-searches-in-PATH-too-like-popen-and-returns-i.dpatch
+++ icinga-1.0.2/debian/patches/93_execvp-searches-in-PATH-too-like-popen-and-returns-i.dpatch
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93_execvp-searches-in-PATH-too-like-popen-and-returns-i.dpatch by Michael Friedrich <michael.friedrich@univie.ac.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: execvp searches in PATH too like popen, and returns if an error occurs, outputting the error string
+
+@DPATCH@
+
+
+diff --git a/Changelog b/Changelog
+index 9de507c..59f6066 100644
+--- a/Changelog
++++ b/Changelog
+@@ -7,9 +7,9 @@ Icinga 1.0.x Change Log
+ ENHANCEMENTS
+
+ FIXES
+-* core: check permissions before calling execv on a command
+ * core: fix temp_path overwritten by check_result_path in base/config.c
+ * core: modify execv to execvp, accepting 4096 cmd args, for both host and service checks with adapted error handling
++* core: execvp searches in PATH too like popen, and returns if error, outputting the errno string
+
+ * classic ui: fix image urls ins stylesheets
+
+@@ -17,6 +17,7 @@ FIXES
+ * install: enable debuginfo in spec file
+
+ * idoutils: adapt oracle-drop.sql for current schema
++* idoutils: fix binding null values to prepared statements in oracle
+
+
+ 1.0.2 - 30/06/2010
+diff --git a/base/checks.c b/base/checks.c
+index d863a58..8f0bdbf 100644
+--- a/base/checks.c
++++ b/base/checks.c
+@@ -226,24 +226,17 @@ static int run_check(char *processed_command,dbuf *checkresult_dbuf){
+ /* extract command args for execv */
+ parse_command_line(processed_command,argv);
+
+- if(!argv[0])
+- _exit(STATE_UNKNOWN);
+-
+- /* check if plugin there/executable */
+- if (access(argv[0], R_OK) !=0 ) {
+- fprintf(stdout,"plugin %s does not exist or is not readable\n",argv[0]);
+- logit(NSLOG_RUNTIME_WARNING,TRUE,"plugin %s does not exists or is not readable\n",argv[0]);
++ if(!argv[0]){
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"plugin command definition empty\n");
+ _exit(STATE_UNKNOWN);
+ }
+
+- if (access(argv[0], X_OK) != 0 ) {
+- fprintf(stdout,"wrong execution permissions on plugin %s\n",argv[0]);
+- logit(NSLOG_RUNTIME_WARNING,TRUE,"wrong execution permissions on plugin %s\n",argv[0]);
++ log_debug_info(DEBUGL_CHECKS,0,"running command %s via execvp\n",processed_command);
++
++ if(execvp(argv[0], argv)<0){ /* execvp only returns in case of an error */
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"error executing command '%s': %s. Make sure that the file actually exists (in PATH, if set) and is executable!\n",processed_command, strerror(errno));
+ _exit(STATE_UNKNOWN);
+ }
+-
+- log_debug_info(DEBUGL_CHECKS,0,"running process %s via execv\n",processed_command);
+- execvp(argv[0], argv); /* instead of execvp since we don't use path */
+ _exit(STATE_UNKNOWN);
+ }
+
+@@ -266,7 +259,7 @@ static int run_check(char *processed_command,dbuf *checkresult_dbuf){
+ retval=-1;
+ }
+ else{
+- log_debug_info(DEBUGL_CHECKS,0,"running process %s via popen\n",processed_command);
++ log_debug_info(DEBUGL_CHECKS,0,"running command %s via popen\n",processed_command);
+ fp=popen(processed_command,"r");
+
+ if(fp==NULL)
+--
+1.7.1
+
--- icinga-1.0.2.orig/debian/patches/80_remove_daemoncheck_cgi.dpatch
+++ icinga-1.0.2/debian/patches/80_remove_daemoncheck_cgi.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_remove_daemoncheck_cgi.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/cgi/cgiutils.c icinga-1.0.2/cgi/cgiutils.c
+--- icinga-1.0.2~/cgi/cgiutils.c 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/cgi/cgiutils.c 2010-06-30 16:56:24.000000000 +0200
+@@ -585,11 +585,6 @@
+ if(options & READ_SERVICE_STATUS)
+ service_status_has_been_read=TRUE;
+
+- /* return error if daemon is not running */
+- if(check_daemon_running()==ERROR) {
+- return ERROR;
+- }
+-
+ return result;
+ }
+
--- icinga-1.0.2.orig/debian/patches/10_p1_pl_shebang.dpatch
+++ icinga-1.0.2/debian/patches/10_p1_pl_shebang.dpatch
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_p1_pl_shebang.dpatch by Marc Haber <mh+debian-packages@zugschlus.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix shebang of perl interpreter
+
+@DPATCH@
+diff -urNad trunk~/p1.pl trunk/p1.pl
+--- trunk~/p1.pl 2006-03-21 23:32:46.000000000 +0000
++++ trunk/p1.pl 2006-06-26 13:55:35.000000000 +0000
+@@ -1,3 +1,5 @@
++#!/usr/bin/perl
++
+ package Embed::Persistent;
+
+ # p1.pl for Nagios 2.0
--- icinga-1.0.2.orig/debian/patches/94_fix-wrong-is_volatile-conditions-causing-wrong-servi.dpatch
+++ icinga-1.0.2/debian/patches/94_fix-wrong-is_volatile-conditions-causing-wrong-servi.dpatch
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 94_fix-wrong-is_volatile-conditions-causing-wrong-servi.dpatch by Michael Friedrich <michael.friedrich@univie.ac.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix wrong is_volatile conditions causing wrong service alerts in the logs
+
+@DPATCH@
+
+
+diff --git a/Changelog b/Changelog
+index 59f6066..ebdc6db 100644
+--- a/Changelog
++++ b/Changelog
+@@ -10,6 +10,7 @@ FIXES
+ * core: fix temp_path overwritten by check_result_path in base/config.c
+ * core: modify execv to execvp, accepting 4096 cmd args, for both host and service checks with adapted error handling
+ * core: execvp searches in PATH too like popen, and returns if error, outputting the errno string
++* core: fix wrong is_volatile conditions causing wrong service alerts in the logs
+
+ * classic ui: fix image urls ins stylesheets
+
+diff --git a/base/checks.c b/base/checks.c
+index 8f0bdbf..190a895 100644
+--- a/base/checks.c
++++ b/base/checks.c
+@@ -1647,7 +1647,7 @@ int handle_async_service_check_result(service *temp_service, check_result *queue
+ }
+
+ /* else log the problem (again) if this service is flagged as being volatile */
+- else if(temp_service->is_volatile==FALSE){
++ else if(temp_service->is_volatile!=FALSE){
+ log_service_event(temp_service);
+ state_was_logged=TRUE;
+ }
+@@ -1673,7 +1673,7 @@ int handle_async_service_check_result(service *temp_service, check_result *queue
+ service_notification(temp_service,NOTIFICATION_NORMAL,NULL,NULL,NOTIFICATION_OPTION_NONE);
+
+ /* run the service event handler if we changed state from the last hard state or if this service is flagged as being volatile */
+- if(hard_state_change==TRUE || temp_service->is_volatile==FALSE)
++ if(hard_state_change==TRUE || temp_service->is_volatile!=FALSE)
+ handle_service_event(temp_service);
+
+ /* save the last hard state */
+diff --git a/cgi/config.c b/cgi/config.c
+index 09adff6..0226d16 100644
+--- a/cgi/config.c
++++ b/cgi/config.c
+@@ -1249,7 +1249,7 @@ void display_services(void){
+
+ printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->parallelize==TRUE)?"Yes":"No");
+
+- printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->is_volatile==FALSE)?"Yes":"No");
++ printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->is_volatile!=FALSE)?"Yes":"No");
+
+ printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->obsess_over_service==TRUE)?"Yes":"No");
+
+--
+1.7.1
+
--- icinga-1.0.2.orig/debian/patches/00list
+++ icinga-1.0.2/debian/patches/00list
@@ -0,0 +1,14 @@
+10_p1_pl_shebang.dpatch
+50_cgi.cfg-debianize.dpatch
+51_commands.cfg-debianize.dpatch
+52_icinga.cfg-debianize.dpatch
+55_idoutils-debianize
+60_fix_p1.pl_patch_mini_epn.dpatch
+70_fix_eventhandler_paths.dpatch
+80_remove_daemoncheck_cgi.dpatch
+90_fix-image-urls-555.dpatch
+91_fix-copy-paste-error-569.dpatch
+92_modify-execv-to-execvp-accepting-4096-cmd-args-for-b.dpatch
+93_execvp-searches-in-PATH-too-like-popen-and-returns-i.dpatch
+94_fix-wrong-is_volatile-conditions-causing-wrong-servi.dpatch
+95_fix-multiurl-action-status-icon-macro-processing-fix.dpatch
--- icinga-1.0.2.orig/debian/patches/90_fix-image-urls-555.dpatch
+++ icinga-1.0.2/debian/patches/90_fix-image-urls-555.dpatch
@@ -0,0 +1,275 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_fix-image-urls-555.dpatch by Christoph Maser <cmr@financial.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix image urls in css #555
+
+@DPATCH@
+
+
+diff --git a/html/stylesheets/avail.css b/html/stylesheets/avail.css
+index ba20bbd..95d2f09 100644
+--- a/html/stylesheets/avail.css
++++ b/html/stylesheets/avail.css
+@@ -17,8 +17,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .reportRange { text-align: center; font-weight: bold; }
+ .reportDuration { text-align: center; }
+diff --git a/html/stylesheets/checksanity.css b/html/stylesheets/checksanity.css
+index d03ba69..b87e8b4 100644
+--- a/html/stylesheets/checksanity.css
++++ b/html/stylesheets/checksanity.css
+@@ -18,8 +18,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .Title { text-align: center; font-weight: bold; font-size: 10pt; }
+ .SectionTitle { text-align: center; font-weight: bold; }
+diff --git a/html/stylesheets/extinfo.css b/html/stylesheets/extinfo.css
+index a5cffa0..ba8c239 100644
+--- a/html/stylesheets/extinfo.css
++++ b/html/stylesheets/extinfo.css
+@@ -17,8 +17,8 @@ td { font-size: 8pt; border: 0; }
+ a.homepageURL:Hover { color: #ff3300; }
+
+ table.linkBox { margin-top: 20px; border: 0; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ div.dataTitle { text-align: center; font-weight: bold; font-size: 10pt; margin-bottom: 15px; }
+ div.data { text-align: center; font-size: 10pt; }
+@@ -111,4 +111,4 @@ th.queue { text-align: left; font-size: 10pt; background-color: #707677; color:
+ .queueOdd { background-color: #ededed; }
+ .queueEven { background-color: #e9e9e9; }
+ .queueENABLED { text-align: center; color: #fff; background-color: #00cc33; }
+-.queueDISABLED { text-align: center; color: #fff; background-color: #ff3300; }
+\ No newline at end of file
++.queueDISABLED { text-align: center; color: #fff; background-color: #ff3300; }
+diff --git a/html/stylesheets/histogram.css b/html/stylesheets/histogram.css
+index da4deb0..7e34b64 100644
+--- a/html/stylesheets/histogram.css
++++ b/html/stylesheets/histogram.css
+@@ -20,8 +20,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .dataTitle { text-align: center; font-weight: bold; font-size: 10pt; }
+
+diff --git a/html/stylesheets/history.css b/html/stylesheets/history.css
+index 8e23d39..5f34984 100644
+--- a/html/stylesheets/history.css
++++ b/html/stylesheets/history.css
+@@ -19,8 +19,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .dataTitle { text-align: center; font-weight: bold; font-size: 10pt; }
+
+@@ -28,4 +28,4 @@ td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35
+ .navBoxItem { color: #707677 }
+ .navBoxFile { color: #707677; font-weight: bold; text-align: center; }
+
+-.dateTimeBreak { font-size: 10pt; font-weight: bold; background-color: #ededed; color: #707677; }
+\ No newline at end of file
++.dateTimeBreak { font-size: 10pt; font-weight: bold; background-color: #ededed; color: #707677; }
+diff --git a/html/stylesheets/interface/common.css b/html/stylesheets/interface/common.css
+index 40c9314..a5fc559 100644
+--- a/html/stylesheets/interface/common.css
++++ b/html/stylesheets/interface/common.css
+@@ -70,14 +70,14 @@ ul {
+ width: 100%;
+ height: 26px;
+ line-height: 26px;
+- background: #ededed url(../../images/interface/bar.gif) top left repeat-x;
++ background: #ededed url(../images/interface/bar.gif) top left repeat-x;
+ }
+
+ #banner {
+ width: 100%;
+ height: 55px;
+ line-height: 55px;
+- background: #ededed url(../../images/interface/Icinga_Header_Webinterface_Pixel.jpg) top left repeat-x;
++ background: #ededed url(../images/interface/Icinga_Header_Webinterface_Pixel.jpg) top left repeat-x;
+ }
+
+ #navigation p {
+diff --git a/html/stylesheets/interface/menu.css b/html/stylesheets/interface/menu.css
+index de391ef..178dafa 100644
+--- a/html/stylesheets/interface/menu.css
++++ b/html/stylesheets/interface/menu.css
+@@ -7,7 +7,7 @@ body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+ color: #000;
+- background: #ededed url(../../images/interface/menu_body.gif) top left repeat-y;
++ background: #ededed url(../images/interface/menu_body.gif) top left repeat-y;
+ }
+
+ img {
+@@ -27,7 +27,7 @@ ul {
+ padding: 0 5px;
+ height: 26px;
+ color: #ef9f1b;
+- background: #ededed url(../../images/interface/bar.gif) top left repeat-x;
++ background: #ededed url(../images/interface/bar.gif) top left repeat-x;
+ border-bottom: 1px solid #fff;
+ line-height: 26px;
+ font-size: 1em;
+@@ -49,7 +49,7 @@ ul {
+
+ #menu ul li a {
+ padding-left: 12px;
+- background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat;
++ background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat;
+ }
+
+ #menu ul li a:link, #menu ul li a:active, #menu ul li a:visited {
+@@ -58,7 +58,7 @@ ul {
+ }
+
+ #menu ul li a:hover {
+- background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat;
++ background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat;
+ color: #000;
+ }
+
+@@ -72,7 +72,7 @@ ul {
+
+ #menu a.flag {
+ padding-left: 12px;
+- background: url(../../images/interface/menu_blank.gif) 0 0.35em no-repeat;
++ background: url(../images/interface/menu_blank.gif) 0 0.35em no-repeat;
+ }
+
+ #menu div.flag {
+diff --git a/html/stylesheets/ministatus.css b/html/stylesheets/ministatus.css
+index a2a232d..bfc1922 100644
+--- a/html/stylesheets/ministatus.css
++++ b/html/stylesheets/ministatus.css
+@@ -18,8 +18,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .filter { border: 0; }
+ .filterTitle { font-size: 10pt; font-weight: bold; }
+@@ -92,4 +92,4 @@ a.hostTotals:hover { color: #000; }
+ .miniStatusDOWN { background-color: #ff3300; text-align: center; }
+ .miniStatusUNREACHABLE { background-color: #bf44b2; text-align: center; }
+ .miniStatusUP a, .miniStatusDOWN a, .miniStatusUNREACHABLE a { color: #000; }
+-.miniStatusUP a:hover, .miniStatusDOWN a:hover, .miniStatusUNREACHABLE a:hover { color: #fff; }
+\ No newline at end of file
++.miniStatusUP a:hover, .miniStatusDOWN a:hover, .miniStatusUNREACHABLE a:hover { color: #fff; }
+diff --git a/html/stylesheets/notifications.css b/html/stylesheets/notifications.css
+index 5c47590..70aefb1 100644
+--- a/html/stylesheets/notifications.css
++++ b/html/stylesheets/notifications.css
+@@ -17,8 +17,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .dataTitle { text-align: center; font-weight: bold; font-size: 10pt; }
+
+diff --git a/html/stylesheets/status.css b/html/stylesheets/status.css
+index 44566b8..0a0345e 100644
+--- a/html/stylesheets/status.css
++++ b/html/stylesheets/status.css
+@@ -18,8 +18,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .filter { border: 0; }
+ .filterTitle { font-size: 10pt; font-weight: bold; }
+diff --git a/html/stylesheets/statusmap.css b/html/stylesheets/statusmap.css
+index a553734..cec0061 100644
+--- a/html/stylesheets/statusmap.css
++++ b/html/stylesheets/statusmap.css
+@@ -17,8 +17,8 @@ a.homepageURL:Hover { font-family: arial,serif; color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .optBox { font-size: 10pt; font-weight: bold; }
+
+diff --git a/html/stylesheets/summary.css b/html/stylesheets/summary.css
+index 1a4dc21..64bce8f 100644
+--- a/html/stylesheets/summary.css
++++ b/html/stylesheets/summary.css
+@@ -18,8 +18,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .reportRange { text-align: center; font-weight: bold; }
+ .reportDuration { text-align: center; }
+@@ -60,4 +60,4 @@ tr.dataOdd td.serviceOK, tr.dataOdd td.serviceWARNING, tr.dataOdd td.serviceUNKN
+ .reportSelectTip { font-style: italic; }
+
+ .reportSelectTitle { text-align: center; font-weight: bold; font-size: 10pt; }
+-.reportSelectSubTitle { text-align: right; }
+\ No newline at end of file
++.reportSelectSubTitle { text-align: right; }
+diff --git a/html/stylesheets/trends.css b/html/stylesheets/trends.css
+index 6e2b93d..e3bd5c5 100644
+--- a/html/stylesheets/trends.css
++++ b/html/stylesheets/trends.css
+@@ -18,8 +18,8 @@ a.homepageURL:Hover { color: #ff3300; }
+
+ .linkBox { border: 0; }
+ table.linkBox { margin-top: 20px; }
+-td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
+-td.linkBox a:hover { background: url(../../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
++td.linkBox a { margin-left: 5px; padding-left: 10px; background: url(../images/interface/menu_li1.gif) 0 0.35em no-repeat; }
++td.linkBox a:hover { background: url(../images/interface/menu_li2.gif) 0 0.35em no-repeat; }
+
+ .helpfulHints { text-align: center; }
+
+--
+1.7.1
+
--- icinga-1.0.2.orig/debian/patches/50_cgi.cfg-debianize.dpatch
+++ icinga-1.0.2/debian/patches/50_cgi.cfg-debianize.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cfg.cfg-debianize.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debianize cgi.cfg
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-20100403125013~/sample-config/cgi.cfg.in icinga-20100403125013/sample-config/cgi.cfg.in
+--- icinga-20100403125013~/sample-config/cgi.cfg.in 2010-03-03 10:29:37.000000000 +0100
++++ icinga-20100403125013/sample-config/cgi.cfg.in 2010-04-03 12:50:55.732189974 +0200
+@@ -55,7 +55,22 @@
+
+ use_pending_states=1
+
++# NAGIOS PROCESS CHECK COMMAND
++# This is the full path and filename of the program used to check
++# the status of the Nagios process. It is used only by the CGIs
++# and is completely optional. However, if you don't use it, you'll
++# see warning messages in the CGIs about the Nagios process
++# not running and you won't be able to execute any commands from
++# the web interface. The program should follow the same rules
++# as plugins; the return codes are the same as for the plugins,
++# it should have timeout protection, it should output something
++# to STDIO, etc.
++#
++# Note: The command line for the check_nagios plugin below may
++# have to be tweaked a bit, as different versions of the plugin
++# use different command line arguments/syntaxes.
+
++icinga_check_command=/usr/lib/nagios/plugins/check_nagios /var/cache/icinga/status.dat 5 '/usr/sbin/icinga'
+
+
+ # AUTHENTICATION USAGE
--- icinga-1.0.2.orig/debian/patches/70_fix_eventhandler_paths.dpatch
+++ icinga-1.0.2/debian/patches/70_fix_eventhandler_paths.dpatch
@@ -0,0 +1,125 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_fix_eventhandler_paths.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes paths for all contributed eventhandlers
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/disable_active_service_checks icinga-1.0.2/contrib/eventhandlers/disable_active_service_checks
+--- icinga-1.0.2~/contrib/eventhandlers/disable_active_service_checks 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/disable_active_service_checks 2010-07-01 07:27:53.010548215 +0200
+@@ -16,7 +16,7 @@
+
+ printfcmd="/usr/bin/printf"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/icinga/rw/icinga.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/disable_notifications icinga-1.0.2/contrib/eventhandlers/disable_notifications
+--- icinga-1.0.2~/contrib/eventhandlers/disable_notifications 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/disable_notifications 2010-07-01 07:28:12.857926063 +0200
+@@ -14,7 +14,7 @@
+
+ printfcmd="/usr/bin/printf"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/icinga/rw/icinga.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler icinga-1.0.2/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
+--- icinga-1.0.2~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler 2010-07-01 07:29:30.946507615 +0200
+@@ -21,7 +21,7 @@
+ #
+
+ # Location of the submit_check_result_via_nsca script
+-SubmitCmd="/usr/local/nagios/libexec/eventhandlers/submit_check_result_via_nsca"
++SubmitCmd="/usr/share/icinga/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca"
+
+ # Convert the state string to the corresponding return code
+ return_code=-1
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca icinga-1.0.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+--- icinga-1.0.2~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca 2010-07-01 07:27:06.502426451 +0200
+@@ -27,8 +27,8 @@
+
+ printfcmd="/usr/bin/printf"
+
+-NscaBin="/usr/local/icinga/libexec/send_nsca"
+-NscaCfg="/usr/local/icinga/etc/send_nsca.cfg"
++NscaBin="/usr/sbin/send_nsca"
++NscaCfg="/etc/send_nsca.cfg"
+ IcingaHost="icingahost"
+
+ # Fire the data off to the NSCA daemon using the send_nsca script
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/enable_active_service_checks icinga-1.0.2/contrib/eventhandlers/enable_active_service_checks
+--- icinga-1.0.2~/contrib/eventhandlers/enable_active_service_checks 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/enable_active_service_checks 2010-07-01 07:28:24.978596351 +0200
+@@ -16,7 +16,7 @@
+
+ printfcmd="/usr/bin/printf"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/icinga/rw/icinga.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/enable_notifications icinga-1.0.2/contrib/eventhandlers/enable_notifications
+--- icinga-1.0.2~/contrib/eventhandlers/enable_notifications 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/enable_notifications 2010-07-01 07:28:56.146507770 +0200
+@@ -14,7 +14,7 @@
+
+ printfcmd="/usr/bin/printf"
+
+-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
++CommandFile="/var/lib/icinga/rw/icinga.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event icinga-1.0.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
+--- icinga-1.0.2~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event 2010-07-01 07:27:06.502426451 +0200
+@@ -9,10 +9,10 @@
+
+ # Location of the echo and mail commands
+ echocmd="/bin/echo"
+-mailcmd="/bin/mail"
++mailcmd="/usr//bin/mail"
+
+ # Location of the event handlers
+-eventhandlerdir="/usr/local/icinga/libexec/eventhandlers"
++eventhandlerdir="/usr/share/icinga/plugins/eventhandlers"
+
+
+ # Only take action on hard host states...
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event icinga-1.0.2/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
+--- icinga-1.0.2~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event 2010-07-01 07:27:06.502426451 +0200
+@@ -9,10 +9,10 @@
+
+ # Location of the echo and mail commands
+ echocmd="/bin/echo"
+-mailcmd="/bin/mail"
++mailcmd="/usr/bin/mail"
+
+ # Location of the event handlers
+-eventhandlerdir="/usr/local/icinga/libexec/eventhandlers"
++eventhandlerdir="/usr/share/icinga/plugins/eventhandlers"
+
+
+ # Only take action on hard service states...
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' icinga-1.0.2~/contrib/eventhandlers/submit_check_result icinga-1.0.2/contrib/eventhandlers/submit_check_result
+--- icinga-1.0.2~/contrib/eventhandlers/submit_check_result 2010-06-30 11:13:42.000000000 +0200
++++ icinga-1.0.2/contrib/eventhandlers/submit_check_result 2010-07-01 07:28:40.350467222 +0200
+@@ -23,7 +23,7 @@
+
+ echocmd="/bin/echo"
+
+-CommandFile="/usr/local/icinga/var/rw/icinga.cmd"
++CommandFile="/var/lib/icinga/rw/icinga.cmd"
+
+ # get the current date/time in seconds since UNIX epoch
+ datetime=`date +%s`
--- icinga-1.0.2.orig/debian/patches/52_nagios.cfg-debianize.dpatch
+++ icinga-1.0.2/debian/patches/52_nagios.cfg-debianize.dpatch
@@ -0,0 +1,152 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_nagios.cfg-debianize.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debianize nagios.cfg
+
+@DPATCH@
+diff -urNad nagios3-3.2.0~/sample-config/nagios.cfg.in nagios3-3.2.0/sample-config/nagios.cfg.in
+--- nagios3-3.2.0~/sample-config/nagios.cfg.in 2008-12-14 15:52:23.000000000 +0100
++++ nagios3-3.2.0/sample-config/nagios.cfg.in 2009-08-27 07:28:59.000000000 +0200
+@@ -2,10 +2,6 @@
+ #
+ # NAGIOS.CFG - Sample Main Config File for Nagios @VERSION@
+ #
+-# Read the documentation for more information on this configuration
+-# file. I've provided some comments here, but things may not be so
+-# clear without further explanation.
+-#
+ # Last Modified: 12-14-2008
+ #
+ ##############################################################################
+@@ -16,9 +12,19 @@
+ # for historical purposes. This should be the first option specified
+ # in the config file!!!
+
+-log_file=@localstatedir@/nagios.log
++log_file=/var/log/nagios3/nagios.log
+
++# Commands definitions
++cfg_file=/etc/nagios3/commands.cfg
+
++# Debian also defaults to using the check commands defined by the debian
++# nagios-plugins package
++cfg_dir=/etc/nagios-plugins/config
++
++# Debian uses by default a configuration directory where nagios3-common,
++# other packages and the local admin can dump or link configuration
++# files into.
++cfg_dir=/etc/nagios3/conf.d
+
+ # OBJECT CONFIGURATION FILE(S)
+ # These are the object configuration files in which you define hosts,
+@@ -27,13 +33,10 @@
+ # if you wish (as shown below), or keep them all in a single config file.
+
+ # You can specify individual object config files as shown below:
+-cfg_file=@sysconfdir@/objects/commands.cfg
+-cfg_file=@sysconfdir@/objects/contacts.cfg
+-cfg_file=@sysconfdir@/objects/timeperiods.cfg
+-cfg_file=@sysconfdir@/objects/templates.cfg
+-
+-# Definitions for monitoring the local (Linux) host
+-cfg_file=@sysconfdir@/objects/localhost.cfg
++#cfg_file=@sysconfdir@/objects/commands.cfg
++#cfg_file=@sysconfdir@/objects/contacts.cfg
++#cfg_file=@sysconfdir@/objects/timeperiods.cfg
++#cfg_file=@sysconfdir@/objects/templates.cfg
+
+ # Definitions for monitoring a Windows machine
+ #cfg_file=@sysconfdir@/objects/windows.cfg
+@@ -64,7 +67,7 @@
+ # directly) in order to prevent inconsistencies that can occur
+ # when the config files are modified after Nagios starts.
+
+-object_cache_file=@localstatedir@/objects.cache
++object_cache_file=/var/cache/nagios3/objects.cache
+
+
+
+@@ -103,7 +106,7 @@
+ # The contents of the status file are deleted every time Nagios
+ # restarts.
+
+-status_file=@localstatedir@/status.dat
++status_file=/var/cache/nagios3/status.dat
+
+
+
+@@ -140,7 +143,7 @@
+ # you will have to enable this.
+ # Values: 0 = disable commands, 1 = enable commands
+
+-check_external_commands=1
++check_external_commands=0
+
+
+
+@@ -169,6 +172,8 @@
+ # is running as (usually 'nobody'). Permissions should be set at the
+ # directory level instead of on the file, as the file is deleted every
+ # time its contents are processed.
++# Debian Users: In case you didn't read README.Debian yet, _NOW_ is the
++# time to do it.
+
+ command_file=@localstatedir@/rw/nagios.cmd
+
+@@ -198,7 +203,7 @@
+ # is created, used, and deleted throughout the time that Nagios is
+ # running.
+
+-temp_file=@localstatedir@/nagios.tmp
++temp_file=/var/cache/nagios3/nagios.tmp
+
+
+
+@@ -264,7 +269,7 @@
+ # This is the directory where archived (rotated) log files should be
+ # placed (assuming you've chosen to do log rotation).
+
+-log_archive_path=@localstatedir@/archives
++log_archive_path=/var/log/nagios3/archives
+
+
+
+@@ -1084,7 +1089,7 @@
+ # strict-iso8601 (YYYY-MM-DDTHH:MM:SS)
+ #
+
+-date_format=us
++date_format=iso8601
+
+
+
+@@ -1114,7 +1119,7 @@
+ # embedded Perl interpreter) is located. If you didn't compile
+ # Nagios with embedded Perl support, this option has no effect.
+
+-p1_file=@bindir@/p1.pl
++p1_file=/usr/lib/nagios3/p1.pl
+
+
+
+@@ -1198,8 +1203,8 @@
+ # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
+ # commands.
+
+-admin_email=@nagios_user@@localhost
+-admin_pager=page@nagios_user@@localhost
++admin_email=root@localhost
++admin_pager=pageroot@localhost
+
+
+
+@@ -1306,7 +1311,7 @@
+ # DEBUG FILE
+ # This option determines where Nagios should write debugging information.
+
+-debug_file=@localstatedir@/nagios.debug
++debug_file=/var/log/nagios3/nagios.debug
+
+
+
--- icinga-1.0.2.orig/debian/patches/92_modify-execv-to-execvp-accepting-4096-cmd-args-for-b.dpatch
+++ icinga-1.0.2/debian/patches/92_modify-execv-to-execvp-accepting-4096-cmd-args-for-b.dpatch
@@ -0,0 +1,592 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_modify-execv-to-execvp-accepting-4096-cmd-args-for-b.dpatch by Michael Friedrich <michael.friedrich@univie.ac.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow 4096 cmd args for execvp
+
+@DPATCH@
+
+
+diff --git a/Changelog b/Changelog
+index e2a3f70..9de507c 100644
+--- a/Changelog
++++ b/Changelog
+@@ -2,6 +2,23 @@
+ Icinga 1.0.x Change Log
+ #######################
+
++1.0.3 - 18/08/2010
++
++ENHANCEMENTS
++
++FIXES
++* core: check permissions before calling execv on a command
++* core: fix temp_path overwritten by check_result_path in base/config.c
++* core: modify execv to execvp, accepting 4096 cmd args, for both host and service checks with adapted error handling
++
++* classic ui: fix image urls ins stylesheets
++
++* install: fix api not installed using make install-unstripped
++* install: enable debuginfo in spec file
++
++* idoutils: adapt oracle-drop.sql for current schema
++
++
+ 1.0.2 - 30/06/2010
+
+ ENHANCEMENTS
+@@ -9,7 +26,7 @@ ENHANCEMENTS
+ * core: check if icinga running before starting; if died remove lockfile first
+ * core: add in sync retention facility (Ton Voon, Opsera Ltd)
+ * core: add new is_volatile setting of 2 for services, which respects the re-notification interval for notifications (Ton Voon)
+-* core: add Icinga option -S functions much like -s but will dump the entire scheduling queue is it would run,
++* core: add Icinga option -S functions much like -s but will dump the entire scheduling queue is it would run,
+ in addition to providing the summary data (Steven (Steven D. Morrey)
+ * core: icinga can send log messages to syslogd using a local facility instead of the default one
+ * core: enhanced diagnostic output when a regular expression fails to compile (Max Schubert)
+@@ -107,7 +124,7 @@ ENHANCEMENTS
+ * core: add service_check_timeout_state configuration variable
+ This setting determines the state Icinga will report when a
+ service check times out - it does not respond within
+- service_check_timeout seconds.
++ service_check_timeout seconds.
+ c - Critical (default)
+ u - Unknown
+ w - Warning
+@@ -119,7 +136,7 @@ ENHANCEMENTS
+ escalation_condition <condition> ( [ & / | ] <condition> )*
+ where <condition> is either host hostname = [u,d,o] or
+ service hostname.service_description] = [w,u,c,o].
+- The escalation_condition accepts a list of one or more conditions
++ The escalation_condition accepts a list of one or more conditions
+ separated by & (logical AND) or | (logical OR).
+ w = WARNING
+ u = UNKNOWN
+@@ -149,7 +166,7 @@ ENHANCEMENTS
+ - dynamic binded procedure for DELETE on table by instance_id called at startup
+ for cleaning config/status
+ - dynamic binded procedure for DELETE on tably by instance_id, field<time called
+- during periodic cleanup in threaded housekeeper
++ during periodic cleanup in threaded housekeeper
+ - all other queries are prepared with their own statement handler
+ 4x DELETE
+ 52x MERGE
+@@ -171,7 +188,7 @@ ENHANCEMENTS
+ * idoutils: add initial debug output for idomod (to be set in idomod.cfg)
+ * idoutils: add database name in connection msg to syslog
+ * idoutils: change mysql db engine to innodb (no table locking, better transcations)
+-* idoutils: add --with-oracle-lib=/path/to/instantclient for runtime export of
++* idoutils: add --with-oracle-lib=/path/to/instantclient for runtime export of
+ LD_LIBRARY_PATH if instantclient not installed to path
+ * idoutils: add max_logentries_age and max_acknowledgements_age to ido2db (check ido2db.cfg)
+
+@@ -181,7 +198,7 @@ FIXES
+ * core: fix event broker callback function self de-registering for callbacks (Sean Millichamp)
+ * core: add missing sound.js provided by scriptaculous
+ * core: string replaces for icinga
+-* core: typo fix in mrtg.cfg (Dennis van Zuijlekom)
++* core: typo fix in mrtg.cfg (Dennis van Zuijlekom)
+ * core: add init info as required by LSB
+ * core: fix perl tests
+ * core: fix missing clean & distclean against tap/ directory
+@@ -195,7 +212,7 @@ FIXES
+ * core: fix idomod doesn't de-initialize after config error
+ * core: fix make fullinstall/idoutils without enabled idoutils during configure
+ * core: fix sending two identical service_status events to neb module
+-* core: fix segmentation fault crash when a non-existant host or service is passed to the command pipe
++* core: fix segmentation fault crash when a non-existant host or service is passed to the command pipe
+ * core: add check for NULL for event_list_high
+
+ * idoutils: modify string escaping for mysql and pgsql
+@@ -320,7 +337,7 @@ FIXES
+ * idoutils: add insert-or-update functions in dbqueries.c, prepared for more rdbms
+ * idoutils: modify insert-or-update queries, build data array for functions
+ * idoutils: fix string escaping for postgresql
+-* idoutils: fix last insert id for postgresql - needs defined sequence id for table
++* idoutils: fix last insert id for postgresql - needs defined sequence id for table
+ * idoutils: modify command_line in commands table to varchar(1024)
+ * idoutils: add more debug output
+ * idoutils: Support 8192 chars of perfdata
+@@ -371,7 +388,7 @@ FIXES
+ Nagios 3.x Change Log
+ #####################
+
+-This is an archived Changelog, all changes on the Icinga Core will be marked and
++This is an archived Changelog, all changes on the Icinga Core will be marked and
+ referenced through issues marking on dev.icinga.org regarding their origin.
+
+ Look at www.nagios.org for an actual changelog of Nagios Core.
+@@ -493,7 +510,7 @@ WARNINGS
+
+ 3.0.5 - 11/04/2008
+ ------------------
+-* Security fix for Cross Site Request Forgery (CSRF) bug reported by Tim Starling.
++* Security fix for Cross Site Request Forgery (CSRF) bug reported by Tim Starling.
+ * Sample audio files for CGIs removed from distribution
+ * Fix for mutliline config file continuation bug
+ * Minor fix to RPM spec file
+@@ -622,7 +639,7 @@ WARNINGS
+ * Fix for compilation bug on systems that don't support setenv() (e.g. Solaris)
+ * Support for line continuation/breaks in config files - end lines with one backslash (\) to continue on next line
+ * Fixed bug with not deleting old check result files that contained results for invalid host/service
+-* Fixed bug with init script option to check Nagios config
++* Fixed bug with init script option to check Nagios config
+ * Auto-filled comment/author fields for acknowledging problems through WAP interface
+ * Fixed bug with processing of CONTACTGROUPNAMES, NOTES, NOTESURL, and ACTIONURL macros
+ * Doc fix regarding soft state dependencies
+@@ -704,7 +721,7 @@ WARNINGS
+ * New macros: $HOSTGROUPMEMBERS$, $HOSTGROUPNOTES$, $HOSTGROUPNOTESURL$, $HOSTGROUPACTIONURL$, $SERVICEGROUPMEMBERS$, $SERVICEGROUPNOTES$, $SERVICEGROUPNOTESURL$, $SERVICEGROUPACTIONURL$, $CONTACTGROUPALIAS$, $CONTACTGROUPMEMBERS$, $NOTIFICATIONRECIPIENTS$, $NOTIFICATIONAUTHOR$, $NOTIFICATIONAUTHORNAME$, $NOTIFICATIONAUTHORALIAS$, $NOTIFICATIONCOMMENT$
+ * Removed host/service downtime author/comment macros introduced in 3.0b2 in favor of more generic $NOTIFICATION...$ macros
+ * Fix for segfault when cancelling active scheduled host downtime
+-* Macro code cleanup
++* Macro code cleanup
+ * Added on-demand contact and contactgroup macro support
+ * More complete (but still partial) support for macros in CGIs ($xNOTES$, $xNOTESURL$, and $xACTIONURL$ macros)
+ * Fixed bug in config CGI with displaying incorrect notification interval for escalations
+@@ -723,7 +740,7 @@ WARNINGS
+ ------------------
+ * Minor bug fix for debug logging of macros
+ * Version number is now printed in CGI pages
+-* HTML documentation cleanup (HTML Tidy, link checking, etc.)
++* HTML documentation cleanup (HTML Tidy, link checking, etc.)
+ * Fixed bug where notifications would not be sent out host/service contact group members
+
+
+@@ -963,5 +980,5 @@ Here are all the changes since Nagios 2.x:
+ and $SERVICEACKAUTHORALIAS$ macros
+
+
+-
++
+
+diff --git a/base/checks.c b/base/checks.c
+index 9f63052..d863a58 100644
+--- a/base/checks.c
++++ b/base/checks.c
+@@ -121,8 +121,166 @@ extern unsigned long max_debug_file_size;
+ extern int use_embedded_perl;
+ #endif
+
++/******************************************************************/
++/********************* MISCELLANEOUS FUNCTIONS ********************/
++/******************************************************************/
++
++/* extract check result */
++static void extract_check_result(FILE *fp,dbuf *checkresult_dbuf){
++ char output_buffer[MAX_INPUT_BUFFER]="";
++ char *temp_buffer;
++
++ /* initialize buffer */
++ strcpy(output_buffer,"");
++
++ /* get all lines of plugin output - escape newlines */
++ while(fgets(output_buffer,sizeof(output_buffer)-1,fp)){
++ temp_buffer=escape_newlines(output_buffer);
++ dbuf_strcat(checkresult_dbuf,temp_buffer);
++ my_free(temp_buffer);
++ }
++}
++
++/* convert a command line to an array of arguments, suitable for exec* functions */
++static int parse_command_line(char *cmd, char *argv[MAX_CMD_ARGS]){
++ unsigned int argc=0;
++ char *parsed_cmd;
++
++ /* Skip initial white-space characters. */
++ for(parsed_cmd=cmd;isspace(*cmd);++cmd)
++ ;
++
++ /* Parse command line. */
++ while(*cmd&&(argc<MAX_CMD_ARGS-1)){
++ argv[argc++]=parsed_cmd;
++
++ switch(*cmd){
++ case '\'':
++ while((*cmd)&&(*cmd!='\''))
++ *(parsed_cmd++)=*(cmd++);
++ if(*cmd)
++ ++cmd;
++ break;
++ case '"':
++ while((*cmd)&&(*cmd!='"')){
++ if((*cmd=='\\')&&cmd[1]&&strchr("\"\\\n",cmd[1]))
++ ++cmd;
++ *(parsed_cmd++)=*(cmd++);
++ }
++ if(*cmd)
++ ++cmd;
++ break;
++ default:
++ while((*cmd)&&!isspace(*cmd)){
++ if((*cmd=='\\')&&cmd[1])
++ ++cmd;
++ *(parsed_cmd++)=*(cmd++);
++ }
++ }
++
++ while(isspace(*cmd))
++ ++cmd;
++
++ if(argc>=MAX_CMD_ARGS-1){
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"overlimit args for command %s\n",argv[0]);
++ _exit(STATE_UNKNOWN);
++ }
++ else
++ *(parsed_cmd++)='\0';
++ }
++
++ argv[argc]=NULL;
++
++ return OK;
++}
++
++/* run a check */
++static int run_check(char *processed_command,dbuf *checkresult_dbuf){
++ char *argv[MAX_CMD_ARGS];
++ FILE *fp;
++ pid_t pid;
++ int pipefds[2];
++ int retval;
++
++ /* check for check execution method (shell or execvp) */
++ if(!has_shell_metachars(processed_command)){
++
++ if(pipe(pipefds)<0){
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"error creating pipe: %s\n", strerror(errno));
++ _exit(STATE_UNKNOWN);
++ }
++ if((pid=fork())<0){
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"fork error\n");
++ _exit(STATE_UNKNOWN);
++ }
++ else if(!pid){
++ /* child replaces stdout/stderr with output of the pipe */
++ if((dup2(pipefds[1],STDOUT_FILENO)<0)||(dup2(pipefds[1],STDERR_FILENO)<0)){
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"dup2 error\n");
++ _exit(STATE_UNKNOWN);
++ }
++
++ /* close unused half of pipe */
++ close(pipefds[1]);
++
++ /* extract command args for execv */
++ parse_command_line(processed_command,argv);
++
++ if(!argv[0])
++ _exit(STATE_UNKNOWN);
++
++ /* check if plugin there/executable */
++ if (access(argv[0], R_OK) !=0 ) {
++ fprintf(stdout,"plugin %s does not exist or is not readable\n",argv[0]);
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"plugin %s does not exists or is not readable\n",argv[0]);
++ _exit(STATE_UNKNOWN);
++ }
++
++ if (access(argv[0], X_OK) != 0 ) {
++ fprintf(stdout,"wrong execution permissions on plugin %s\n",argv[0]);
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"wrong execution permissions on plugin %s\n",argv[0]);
++ _exit(STATE_UNKNOWN);
++ }
+
++ log_debug_info(DEBUGL_CHECKS,0,"running process %s via execv\n",processed_command);
++ execvp(argv[0], argv); /* instead of execvp since we don't use path */
++ _exit(STATE_UNKNOWN);
++ }
++
++ /* prepare pipe reading */
++ close(pipefds[1]);
++ fp=fdopen(pipefds[0],"r");
++ if(!fp){
++ logit(NSLOG_RUNTIME_WARNING,TRUE,"fdopen error\n");
++ _exit(STATE_UNKNOWN);
++ }
+
++ /* extract check result */
++ extract_check_result(fp,checkresult_dbuf);
++
++ /* close the process */
++ fclose(fp);
++ close(pipefds[0]);
++
++ if(waitpid(pid,&retval,0)!=pid)
++ retval=-1;
++ }
++ else{
++ log_debug_info(DEBUGL_CHECKS,0,"running process %s via popen\n",processed_command);
++ fp=popen(processed_command,"r");
++
++ if(fp==NULL)
++ _exit(STATE_UNKNOWN);
++
++ /* extract check result */
++ extract_check_result(fp,checkresult_dbuf);
++
++ /* close the process */
++ retval=pclose(fp);
++ }
++
++ return retval;
++}
+
+
+ /******************************************************************/
+@@ -330,14 +488,12 @@ int run_scheduled_service_check(service *svc, int check_options, double latency)
+ int run_async_service_check(service *svc, int check_options, double latency, int scheduled_check, int reschedule_check, int *time_is_valid, time_t *preferred_time){
+ char *raw_command=NULL;
+ char *processed_command=NULL;
+- char output_buffer[MAX_INPUT_BUFFER]="";
+ char *temp_buffer=NULL;
+ struct timeval start_time,end_time;
+ pid_t pid=0;
+ int fork_error=FALSE;
+ int wait_result=0;
+ host *temp_host=NULL;
+- FILE *fp=NULL, *chldfp;
+ int pclose_result=0;
+ mode_t new_umask=077;
+ mode_t old_umask;
+@@ -346,7 +502,6 @@ int run_async_service_check(service *svc, int check_options, double latency, int
+ dbuf checkresult_dbuf;
+ int dbuf_chunk=1024;
+ int pipefds[2], chldstatus, i;
+- char *chldargs[MAXCHLDARGS];
+ char *s , *p;
+
+ #ifdef USE_EVENT_BROKER
+@@ -557,7 +712,7 @@ int run_async_service_check(service *svc, int check_options, double latency, int
+ else
+ args[3]=processed_command+strlen(fname)+1;
+
+- ENTER;
++ ENTER;
+ SAVETMPS;
+ PUSHMARK(SP);
+ XPUSHs(sv_2mortal(newSVpv(args[0],0)));
+@@ -610,7 +765,7 @@ int run_async_service_check(service *svc, int check_options, double latency, int
+ fprintf(check_result_info.output_file_fp,"early_timeout=%d\n",check_result_info.early_timeout);
+ fprintf(check_result_info.output_file_fp,"exited_ok=%d\n",check_result_info.exited_ok);
+ fprintf(check_result_info.output_file_fp,"return_code=%d\n",check_result_info.return_code);
+- fprintf(check_result_info.output_file_fp,"output=%s\n",(checkresult_dbuf.buf==NULL)?"(null)":checkresult_dbuf.buf);
++ fprintf(check_result_info.output_file_fp,"output=%s\n",(checkresult_dbuf.buf==NULL)?"(null)":checkresult_dbuf.buf);
+
+ /* close the temp file */
+ fclose(check_result_info.output_file_fp);
+@@ -702,7 +857,7 @@ int run_async_service_check(service *svc, int check_options, double latency, int
+ /* execute our previously compiled script - from call_pv("Embed::Persistent::eval_file",..) */
+ /* NB. args[2] is _now_ a code ref (to the Perl subroutine corresp to the plugin) returned by eval_file() */
+
+- ENTER;
++ ENTER;
+ SAVETMPS;
+ PUSHMARK(SP);
+
+@@ -751,11 +906,11 @@ int run_async_service_check(service *svc, int check_options, double latency, int
+ fprintf(check_result_info.output_file_fp,"early_timeout=%d\n",check_result_info.early_timeout);
+ fprintf(check_result_info.output_file_fp,"exited_ok=%d\n",check_result_info.exited_ok);
+ fprintf(check_result_info.output_file_fp,"return_code=%d\n",check_result_info.return_code);
+- fprintf(check_result_info.output_file_fp,"output=%s\n",(checkresult_dbuf.buf==NULL)?"(null)":checkresult_dbuf.buf);
++ fprintf(check_result_info.output_file_fp,"output=%s\n",(checkresult_dbuf.buf==NULL)?"(null)":checkresult_dbuf.buf);
+
+ /* close the temp file */
+ fclose(check_result_info.output_file_fp);
+-
++
+ /* move check result to queue directory */
+ move_check_result_to_queue(check_result_info.output_file);
+ }
+@@ -772,111 +927,10 @@ int run_async_service_check(service *svc, int check_options, double latency, int
+ #endif
+ /******** END EMBEDDED PERL INTERPRETER EXECUTION ********/
+
+-
+- /* run the plugin check command */
+-
+- if (!has_shell_metachars(processed_command)){
+- if (pipe(pipefds) == -1){
+- logit(NSLOG_RUNTIME_WARNING,TRUE,"error creating pipe: %s\n",strerror(errno));
+- _exit(STATE_UNKNOWN);
+- }
+-
+-
+- pid = fork();
+- if (pid == -1){
+- logit(NSLOG_RUNTIME_WARNING,TRUE,"fork error\n");
+- _exit(STATE_UNKNOWN);
+- }
+-
+- if (pid == 0){
+- close(pipefds[0]);
+-
+- if (dup2(pipefds[1],STDOUT_FILENO) == -1){
+- logit(NSLOG_RUNTIME_WARNING,TRUE,"dup2 error\n");
+- _exit(EXIT_FAILURE);
+- }
+-
+- if (dup2(pipefds[1],STDERR_FILENO) == -1){
+- logit(NSLOG_RUNTIME_WARNING,TRUE,"dup2 error\n");
+- _exit(EXIT_FAILURE);
+- }
+- close(pipefds[0]);
+-
+- s = strchr(processed_command,' ');
+- if (s){
+- *s = '\0';
+- p = s+1;
+- for(;isspace(*p);p++)
+- ;
+-
+- chldargs[0] = processed_command;
+- for(i=1;i<MAXCHLDARGS-2;i++){
+- s = strchr(p,' ');
+- chldargs[i] = p;
+-
+- if (s){
+- *s = '\0';
+- p = s+1;
+- for(;isspace(*p);p++)
+- ;
+- }
+-
+- if (!s)
+- break;
+- }
+-
+- if (i >= MAXCHLDARGS-2){
+- logit(NSLOG_RUNTIME_WARNING,TRUE,"overlimit args for command %s\n",chldargs[0]);
+- _exit(EXIT_FAILURE);
+- }
+- else
+- chldargs[++i] = '\0';
+- }
+- else{
+- chldargs[0] = processed_command;
+- chldargs[1] = '\0';
+- }
+-
+- log_debug_info(DEBUGL_CHECKS,0,"running process %s via execv\n",processed_command);
+- execv(chldargs[0],chldargs);
+- _exit(EXIT_FAILURE);
+- }
+
++ /* run the plugin check command */
++ pclose_result=run_check(processed_command,&checkresult_dbuf);
+
+- close(pipefds[1]);
+-
+- chldfp = fdopen(pipefds[0],"r");
+- if (chldfp == NULL){
+- logit(NSLOG_RUNTIME_WARNING,TRUE,"fdopen error\n");
+- _exit(EXIT_FAILURE);
+- }
+-
+- while(fgets(output_buffer,sizeof(output_buffer)-1,chldfp)){
+- temp_buffer=escape_newlines(output_buffer);
+- dbuf_strcat(&checkresult_dbuf,temp_buffer);
+- my_free(temp_buffer);
+- }
+-
+- fclose(chldfp);
+- waitpid(pid,&chldstatus,0);
+- pclose_result=chldstatus;
+- }
+- else{
+- log_debug_info(DEBUGL_CHECKS,0,"running process %s via popen\n",processed_command);
+- fp=popen(processed_command,"r");
+- if(fp==NULL)
+- _exit(STATE_UNKNOWN);
+-
+- strcpy(output_buffer,"");
+-
+- while(fgets(output_buffer,sizeof(output_buffer)-1,fp)){
+- temp_buffer=escape_newlines(output_buffer);
+- dbuf_strcat(&checkresult_dbuf,temp_buffer);
+- my_free(temp_buffer);
+- }
+-
+- pclose_result=pclose(fp);
+- }
+ /* reset the alarm */
+ alarm(0);
+
+@@ -1045,7 +1099,7 @@ int handle_async_service_check_result(service *temp_service, check_result *queue
+
+ /* DISCARD INVALID FRESHNESS CHECK RESULTS */
+ /* If a services goes stale, Icinga will initiate a forced check in order to freshen it. There is a race condition whereby a passive check
+- could arrive between the 1) initiation of the forced check and 2) the time when the forced check result is processed here. This would
++ could arrive between the 1) initiation of the forced check and 2) the time when the forced check result is processed here. This would
+ make the service fresh again, so we do a quick check to make sure the service is still stale before we accept the check result. */
+ if((queued_check_result->check_options & CHECK_OPTION_FRESHNESS_CHECK) && is_service_result_fresh(temp_service,current_time,FALSE)==TRUE){
+ log_debug_info(DEBUGL_CHECKS,0,"Discarding service freshness check result because the service is currently fresh (race condition avoided).\n");
+@@ -2946,13 +3000,11 @@ int run_scheduled_host_check_3x(host *hst, int check_options, double latency){
+ int run_async_host_check_3x(host *hst, int check_options, double latency, int scheduled_check, int reschedule_check, int *time_is_valid, time_t *preferred_time){
+ char *raw_command=NULL;
+ char *processed_command=NULL;
+- char output_buffer[MAX_INPUT_BUFFER]="";
+ char *temp_buffer=NULL;
+ struct timeval start_time,end_time;
+ pid_t pid=0;
+ int fork_error=FALSE;
+ int wait_result=0;
+- FILE *fp=NULL;
+ int pclose_result=0;
+ mode_t new_umask=077;
+ mode_t old_umask;
+@@ -3176,22 +3228,7 @@ int run_async_host_check_3x(host *hst, int check_options, double latency, int sc
+ max_debug_file_size=0L;
+
+ /* run the plugin check command */
+- fp=popen(processed_command,"r");
+- if(fp==NULL)
+- _exit(STATE_UNKNOWN);
+-
+- /* initialize buffer */
+- strcpy(output_buffer,"");
+-
+- /* get all lines of plugin output - escape newlines */
+- while(fgets(output_buffer,sizeof(output_buffer)-1,fp)){
+- temp_buffer=escape_newlines(output_buffer);
+- dbuf_strcat(&checkresult_dbuf,temp_buffer);
+- my_free(temp_buffer);
+- }
+-
+- /* close the process */
+- pclose_result=pclose(fp);
++ pclose_result=run_check(processed_command,&checkresult_dbuf);
+
+ /* reset the alarm */
+ alarm(0);
+@@ -3223,7 +3260,7 @@ int run_async_host_check_3x(host *hst, int check_options, double latency, int sc
+ fprintf(check_result_info.output_file_fp,"early_timeout=%d\n",check_result_info.early_timeout);
+ fprintf(check_result_info.output_file_fp,"exited_ok=%d\n",check_result_info.exited_ok);
+ fprintf(check_result_info.output_file_fp,"return_code=%d\n",check_result_info.return_code);
+- fprintf(check_result_info.output_file_fp,"output=%s\n",(checkresult_dbuf.buf==NULL)?"(null)":checkresult_dbuf.buf);
++ fprintf(check_result_info.output_file_fp,"output=%s\n",(checkresult_dbuf.buf==NULL)?"(null)":checkresult_dbuf.buf);
+
+ /* close the temp file */
+ fclose(check_result_info.output_file_fp);
+@@ -3342,7 +3379,7 @@ int handle_async_host_check_result_3x(host *temp_host, check_result *queued_chec
+
+ /* DISCARD INVALID FRESHNESS CHECK RESULTS */
+ /* If a host goes stale, Icinga will initiate a forced check in order to freshen it. There is a race condition whereby a passive check
+- could arrive between the 1) initiation of the forced check and 2) the time when the forced check result is processed here. This would
++ could arrive between the 1) initiation of the forced check and 2) the time when the forced check result is processed here. This would
+ make the host fresh again, so we do a quick check to make sure the host is still stale before we accept the check result. */
+ if((queued_check_result->check_options & CHECK_OPTION_FRESHNESS_CHECK) && is_host_result_fresh(temp_host,current_time,FALSE)==TRUE){
+ log_debug_info(DEBUGL_CHECKS,0,"Discarding host freshness check result because the host is currently fresh (race condition avoided).\n");
+diff --git a/include/icinga.h b/include/icinga.h
+index 7b9d413..b63265c 100644
+--- a/include/icinga.h
++++ b/include/icinga.h
+@@ -46,8 +46,7 @@ extern "C" {
+ command file. EG 10/19/07
+ */
+ #define MAX_PLUGIN_OUTPUT_LENGTH 8192 /* max length of plugin output (including perf data) */
+-#define MAXCHLDARGS 20
+-
++#define MAX_CMD_ARGS 4096 /* max number of arguments for command call on plugin */
+
+
+ /******************* DEFAULT VALUES *******************/
+--
+1.7.1
+
--- icinga-1.0.2.orig/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch
+++ icinga-1.0.2/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_fix_p1.pl_patch_mini_epn.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Call p1.pl from /usr/lib/nagios3
+
+@DPATCH@
+diff -urNad nagios3-3.0.3~/contrib/mini_epn.c nagios3-3.0.3/contrib/mini_epn.c
+--- nagios3-3.0.3~/contrib/mini_epn.c 2005-11-15 01:49:36.000000000 +0000
++++ nagios3-3.0.3/contrib/mini_epn.c 2008-07-18 19:59:37.000000000 +0000
+@@ -17,7 +17,7 @@
+ #endif
+ */
+
+- char *embedding[] = { "", "p1.pl" };
++ char *embedding[] = { "", "/usr/lib/icinga/p1.pl" };
+ char *plugin_output ;
+ char fname[64];
+ char *args[] = {"","0", "", "", NULL };
--- icinga-1.0.2.orig/debian/patches/95_fix-multiurl-action-status-icon-macro-processing-fix.dpatch
+++ icinga-1.0.2/debian/patches/95_fix-multiurl-action-status-icon-macro-processing-fix.dpatch
@@ -0,0 +1,101 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 95_fix-multiurl-action-status-icon-macro-processing-fix.dpatch.dpatch by Michael Friedrich <michael.friedrich@univie.ac.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix multiurl action/status icon+macro processing; fix invalid pointer in extinfo.cgi
+
+@DPATCH@
+
+
+diff --git a/Changelog b/Changelog
+index ebdc6db..8b4c30b 100644
+--- a/Changelog
++++ b/Changelog
+@@ -13,6 +13,8 @@ FIXES
+ * core: fix wrong is_volatile conditions causing wrong service alerts in the logs
+
+ * classic ui: fix image urls ins stylesheets
++* classic ui: fix invalid pointer in extinfo.cgi type=7
++fix macro processing (Jochen Bern)
+
+ * install: fix api not installed using make install-unstripped
+ * install: enable debuginfo in spec file
+diff --git a/cgi/extinfo.c b/cgi/extinfo.c
+index 55fc382..63cf8dd 100644
+--- a/cgi/extinfo.c
++++ b/cgi/extinfo.c
+@@ -2975,8 +2975,6 @@ void show_scheduling_queue(void){
+ printf("&service=%s%s'><img src='%s%s' border=0 ALT='Re-schedule This Service Check' TITLE='Re-schedule This Service Check'></a>\n",url_encode(temp_svcstatus->description),(temp_svcstatus->checks_enabled==TRUE)?"&force_check":"",url_images_path,DELAY_ICON);
+ printf("</TD>\n");
+
+- free(temp_host);
+- free(temp_service);
+ }
+
+ /* get the host status */
+@@ -3027,7 +3025,6 @@ void show_scheduling_queue(void){
+ printf("'><img src='%s%s' border=0 ALT='Re-schedule This Host Check' TITLE='Re-schedule This Host Check'></a>\n",url_images_path,DELAY_ICON);
+ printf("</TD>\n");
+
+- free(temp_host);
+ }
+
+ printf("</TR>\n");
+diff --git a/cgi/status.c b/cgi/status.c
+index 3e70fa7..ee91a19 100644
+--- a/cgi/status.c
++++ b/cgi/status.c
+@@ -1731,7 +1731,7 @@ void show_service_detail(void){
+ printf("<A HREF='");
+ printf("%s",processed_string);
+ printf("' TARGET='%s'>",(notes_url_target==NULL)?"_blank":notes_url_target);
+- printf("<IMG SRC='%s%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='%s' TITLE='%s'>",url_images_path,NOTES_ICON,MU_iconstr,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT,"View Extra Service Notes","View Extra Service Notes");
++ printf("<IMG SRC='%s%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='%s' TITLE='%s'>",url_images_path,MU_iconstr,NOTES_ICON,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT,"View Extra Service Notes","View Extra Service Notes");
+ printf("</A>");
+ printf("</TD>\n");
+ END_MULTIURL_LOOP
+@@ -1744,7 +1744,7 @@ void show_service_detail(void){
+ printf("<A HREF='");
+ printf("%s",processed_string);
+ printf("' TARGET='%s'>",(action_url_target==NULL)?"_blank":action_url_target);
+- printf("<IMG SRC='%s%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='%s' TITLE='%s'>",url_images_path,ACTION_ICON,MU_iconstr,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT,"Perform Extra Service Actions","Perform Extra Service Actions");
++ printf("<IMG SRC='%s%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='%s' TITLE='%s'>",url_images_path,MU_iconstr,ACTION_ICON,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT,"Perform Extra Service Actions","Perform Extra Service Actions");
+ printf("</A>");
+ printf("</TD>\n");
+ END_MULTIURL_LOOP
+diff --git a/common/macros.c b/common/macros.c
+index 149b338..01e54fe 100644
+--- a/common/macros.c
++++ b/common/macros.c
+@@ -77,6 +77,7 @@ contactgroup *macro_contactgroup_ptr=NULL;
+ /* replace macros in notification commands with their values */
+ int process_macros(char *input_buffer, char **output_buffer, int options){
+ char *temp_buffer=NULL;
++ char *save_buffer=NULL;
+ char *buf_ptr=NULL;
+ char *delim_ptr=NULL;
+ int in_macro=FALSE;
+@@ -107,7 +108,9 @@ int process_macros(char *input_buffer, char **output_buffer, int options){
+ log_debug_info(DEBUGL_MACROS,1,"**** BEGIN MACRO PROCESSING ***********\n");
+ log_debug_info(DEBUGL_MACROS,1,"Processing: '%s'\n",input_buffer);
+
+- buf_ptr=input_buffer;
++ /* save original input_buffer ptr for later free'ing */
++ save_buffer=buf_ptr=(input_buffer?strdup(input_buffer):NULL);
++
+ while(buf_ptr){
+
+ /* save pointer to this working part of buffer */
+@@ -240,6 +243,9 @@ int process_macros(char *input_buffer, char **output_buffer, int options){
+ log_debug_info(DEBUGL_MACROS,1," Done. Final output: '%s'\n",*output_buffer);
+ log_debug_info(DEBUGL_MACROS,1,"**** END MACRO PROCESSING *************\n");
+
++ if (save_buffer)
++ free(save_buffer);
++
+ return OK;
+ }
+
+--
+1.7.1
+
--- icinga-1.0.2.orig/debian/po/sv.po
+++ icinga-1.0.2/debian/po/sv.po
@@ -0,0 +1,99 @@
+# translation of icinga to swedish
+# Copyright (C) 2010 Martin Bagge
+# This file is distributed under the same license as the icinga package.
+#
+# Martin Bagge <brother@bsnet.se>, 2008, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-22 22:51+0100\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Apacheserver som ska förberedas för icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr "Välj den apacheserver som ska ställas in för icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Om du föredrar att ställa in apache manuellt markerar du inte något av "
+"alternativen."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Lösenord för icinga webbadministration:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Ange lösenordet som ska användas för användaren \"icingaadmin\"."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Detta användarnamn och lösenord används för att ansluta till icingaservern "
+"när installationen är klar. Om du inte anger ett lösenord här måste du "
+"ställa in autentiseringen manuellt senare."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Ange lösenordet igen för att verifiera det:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr "Ange samma lösenord igen för att verifiera att du skrivit rätt."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Fel vid inmatning av lösenord"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr "Lösenorden stämde inte överrens. Försök igen."
+
+#~ msgid "Password confirmation:"
+#~ msgstr "Upprepa lösenordet:"
+
+#~ msgid "The passwords do not match"
+#~ msgstr "Lösenorden stämmer inte överrens"
--- icinga-1.0.2.orig/debian/po/cs.po
+++ icinga-1.0.2/debian/po/cs.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the icinga package.
+# Martin Sin <martin.sin@zshk.cz>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga 2.4-1\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-06 10:22+0200\n"
+"Last-Translator: Martin Sin <martin.sin@zshk.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Servery Apache pro nastavení s icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr "Vyberte prosím, které servery Apache nastavit pro použití s icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr "Pokud dáváte přednost ruční konfiguraci, nevybírejte žádné servery."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Heslo webové administrace Icinga:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr ""
+"Zadejte prosím heslo použité pro nově vytvořeného uživatele \"icingaadmin\"."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Toto uživatelské jméno a heslo se používá pro připojení k serveru Icinga. "
+"Pokud nezadáte nějaké heslo, budete muset nastavit přístup k Icinga ručně."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Potvrďte heslo pro ověření:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr "Zadejte prosím stejné heslo znovu pro ověření, že je zadané správně."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Chyba zadání hesla"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr "Zadaná hesla nesouhlasí. Zkuste to prosím znovu."
+
+#~ msgid "Password confirmation:"
+#~ msgstr "Potvrzení hesla:"
+
+#~ msgid "The passwords do not match"
+#~ msgstr "Hesla nesouhlasí"
+
+#, fuzzy
+#~| msgid "Enable support for nagios 1.x links in icinga?"
+#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgstr "Povolit podporu odkazů nagios 1.x v icinga?"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please choose whether the Apache configuration for icinga should provide "
+#~| "compatibility with links from nagios 1.x."
+#~ msgid ""
+#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "compatibility with links from nagios 1.x."
+#~ msgstr ""
+#~ "Vyberte si prosím, zda má konfigurace Apache pro icinga poskytovat "
+#~ "kompatibilitu s odkazy z nagios 1.x."
+
+#~ msgid ""
+#~ "If you select this option, the apache configuration used for nagios will "
+#~ "include directives to support URLs from nagios 1.x. You should not choose "
+#~ "this option if you still have nagios 1.x on your system, or unpredictable "
+#~ "results may occur."
+#~ msgstr ""
+#~ "Pokud zvolíte tuto možnost, konfigurace apache použitá pro nagios bude "
+#~ "obsahovat příkazy pro podporu URL adres známých z nagios 1.x. Tuto volbu "
+#~ "byste neměli volit v případě, že máte dosud nainstalován nagios 1.x. "
+#~ "Jinak může dojít k neočekávaným výsledkům."
+
+#~ msgid "apache2"
+#~ msgstr "apache2"
+
+#~ msgid "false"
+#~ msgstr "chybné"
--- icinga-1.0.2.orig/debian/po/ja.po
+++ icinga-1.0.2/debian/po/ja.po
@@ -0,0 +1,139 @@
+# Japanese debconf templates translation for icinga.
+# Copyright (C) 2007 Noritada Kobayashi
+# This file is distributed under the same license as the icinga package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga (debconf) 2.6-3\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2007-03-02 22:03+0900\n"
+"Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+#, fuzzy
+#| msgid "Apache servers to configure for icinga:"
+msgid "Apache servers to configure for icinga:"
+msgstr "icinga の設定をする Apache サーバ:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+#, fuzzy
+#| msgid "Please select which apache servers should be configured for icinga."
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr "icinga の設定をする Apache サーバを選択してください。"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"手動で設定を行う方がよい場合は、どのサーバも選択せずに次に進んでください。"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid "Nagios web administration password:"
+msgid "Icinga web administration password:"
+msgstr "nagios ウェブ管理用パスワード:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please provide the password to be created with the \"nagiosadmin\" user."
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "\"nagiosadmin\" ユーザ用に作成するパスワードを入力してください。"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid ""
+#| "This is the username and password you will use to log in to your nagios "
+#| "installation after configuration is complete. If you do not provide a "
+#| "password, you will have to configure access to nagios yourself."
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"これは、設定完了後に、インストールした nagios にログインするのに使用される"
+"ユーザ名とパスワードです。ここでパスワードを入力しない場合は、nagios へのアク"
+"セスを自分で設定しなければなりません。"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#~ msgid "Password confirmation:"
+#~ msgstr "パスワードの確認:"
+
+#~ msgid "The passwords do not match"
+#~ msgstr "パスワードが一致しません"
+
+#, fuzzy
+#~| msgid "Enable support for nagios 1.x links in icinga?"
+#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgstr "icinga 内で nagios 1.x のリンクのサポートを有効にしますか?"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please choose whether the Apache configuration for icinga should provide "
+#~| "compatibility with links from nagios 1.x."
+#~ msgid ""
+#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "compatibility with links from nagios 1.x."
+#~ msgstr ""
+#~ "icinga 用の Apache の設定によって nagios 1.x 由来のリンクとの互換性を与え"
+#~ "るかどうかを選択してください。"
+
+#~ msgid ""
+#~ "If you select this option, the apache configuration used for nagios will "
+#~ "include directives to support URLs from nagios 1.x. You should not choose "
+#~ "this option if you still have nagios 1.x on your system, or unpredictable "
+#~ "results may occur."
+#~ msgstr ""
+#~ "このオプションを選択すると、nagios 用に使用される Apache の設定に、nagios "
+#~ "1.x 由来の URL をサポートするディレクティブが含まれるようになります。シス"
+#~ "テムでまだ nagios 1.x を使用している場合はこのオプションを選択すべきではあ"
+#~ "りません。選択すると予測不可能な結果になります。"
+
+# FIXME: Do not mark for translation since these are package names.
+#~ msgid "apache2"
+#~ msgstr "apache2"
--- icinga-1.0.2.orig/debian/po/fi.po
+++ icinga-1.0.2/debian/po/fi.po
@@ -0,0 +1,133 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+#, fuzzy
+#| msgid "Apache servers to configure for icinga:"
+msgid "Apache servers to configure for icinga:"
+msgstr "Apache-palvelimet, joiden asetuksia muokataan icinga:a varten:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+#, fuzzy
+#| msgid "Please select which apache servers should be configured for icinga."
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr ""
+"Valitse minkä Apache-palvelimien asetuksia tulisi muokata icinga:n "
+"käyttöönottamiseksi."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr "Jos haluat tehdä asetukset käsin, älä valitse mitään palvelinta."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid "Nagios web administration password:"
+msgid "Icinga web administration password:"
+msgstr "Nagios-verkkoylläpidon salasana:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please provide the password to be created with the \"nagiosadmin\" user."
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Anna salasana käyttäjätunnukselle ”nagiosadmin”."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid ""
+#| "This is the username and password you will use to log in to your nagios "
+#| "installation after configuration is complete. If you do not provide a "
+#| "password, you will have to configure access to nagios yourself."
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Tämän käyttäjätunnuksen ja salasanan avulla voidaan nagios-asennukseen "
+"kirjautua, kun asetusten muokkaus on päättynyt. Jos salasanaa ei anneta, "
+"täytyy nagiokseen pääsy asettaa käsin."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#~ msgid "Password confirmation:"
+#~ msgstr "Salasanan vahvistus:"
+
+#~ msgid "The passwords do not match"
+#~ msgstr "Salasanat eivät täsmää."
+
+#, fuzzy
+#~| msgid "Enable support for nagios 1.x links in icinga?"
+#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgstr "Otetaanko nagiosin version 1.x linkkien tuki käyttöön icinga:ssa?"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please choose whether the Apache configuration for icinga should provide "
+#~| "compatibility with links from nagios 1.x."
+#~ msgid ""
+#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "compatibility with links from nagios 1.x."
+#~ msgstr ""
+#~ "Valitse tulisiko icinga:n Apache-asetusten olla yhteensopivia nagios 1.x:"
+#~ "n linkkien kanssa."
+
+#~ msgid ""
+#~ "If you select this option, the apache configuration used for nagios will "
+#~ "include directives to support URLs from nagios 1.x. You should not choose "
+#~ "this option if you still have nagios 1.x on your system, or unpredictable "
+#~ "results may occur."
+#~ msgstr ""
+#~ "Jos valitset tämän, Apachen nagios-asetuksiin sisällytetään tuki nagios 1."
+#~ "x:n URLeille. Tätä ei tulisi valita, jos järjestelmässä on edelleen "
+#~ "nagios 1.x asennettuna, koska seuraukset eivät ole ennustettavissa."
--- icinga-1.0.2.orig/debian/po/POTFILES.in
+++ icinga-1.0.2/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] icinga-cgi.templates
--- icinga-1.0.2.orig/debian/po/de.po
+++ icinga-1.0.2/debian/po/de.po
@@ -0,0 +1,95 @@
+# translation of po-debconf template to German
+# This file is distributed under the same license as the icinga package.
+#
+# Copyright ©:
+# Matthias Julius <mdeb@julius-net.net>, 2006, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga 1.0.1-3\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-20 00:04-0400\n"
+"Last-Translator: Matthias Julius <mdeb@julius-net.net>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Für Icinga einzurichtende Apache-Server:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr ""
+"Bitte wählen Sie, welche Apache-Server für Icinga eingerichtet werden sollen."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Falls Sie es vorziehen, die Einrichtung manuell durchzuführen, wählen Sie "
+"keine Server aus."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Passwort für die Web-Administration von Icinga:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Bitte geben Sie das Passwort für den Benutzer »icingaadmin« ein."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Dies sind Benutzername und Passwort zur Anmeldung beim Icinga-Server nach "
+"dessen Einrichtung. Falls Sie kein Passwort eingeben, müssen Sie den Zugang "
+"zu Icinga manuell einrichten."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Passwort nochmal eingeben:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr "Bitte geben Sie dasselbe Passwort zur Überprüfung erneut ein."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Fehler bei der Passworteingabe"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+"Die beiden Passwörter, die Sie eingegeben haben, sind nicht gleich. Bitte "
+"versuchen Sie es noch einmal."
--- icinga-1.0.2.orig/debian/po/ru.po
+++ icinga-1.0.2/debian/po/ru.po
@@ -0,0 +1,92 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
+# Yuri Kozlov <yuray@komyakino.ru>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga 1.0.1-3\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-08 15:44+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Серверы apache для настройки под icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr "Выберите серверы Apache, которые нужно настроить для icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr "Если вы хотите выполнить настройку вручную, то ничего не выбирайте."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Пароль для веб-администрирования icinga:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Введите пароль для создаваемой учётной записи \"icingaadmin\"."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Эта учётная запись и пароль будут использованы для доступа к серверу Icinga "
+"после завершения настройки. Если вы не укажите пароль, то вам нужно будет "
+"настроить доступ к Icinga самостоятельно."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Введите пароль ещё раз для проверки:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr "Введите тот же пароль пользователя для проверки правильности ввода."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Ошибка ввода пароля"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr "Введённые пароли не совпали. Попробуйте ещё раз."
--- icinga-1.0.2.orig/debian/po/it.po
+++ icinga-1.0.2/debian/po/it.po
@@ -0,0 +1,92 @@
+# Italian (it) translation of debconf templates for icinga
+# COPYRIGHT (C) 2010 THE ICINGA'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the icinga package.
+# Luca Monducci <luca.mo@tiscali.it>, 2008-2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga 1.0.1-3 italian debconf\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-08 14:12+0200\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Server Apache da configurare per icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr "Selezionare quali server Apache devono essere configurati per icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Per effettuare una configurazione manuale, lasciare tutti i server non "
+"selezionati."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Password per l'amministrazione di Icinga da web:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Inserire la password da associare all'utente \"icingaadmin\"."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Questi sono il nome utente e la password per connettersi al server Icinga al "
+"termine della configurazione. Se non si specifica una password, in seguito "
+"si dovrà configurare l'accesso a Icinga manualmente."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Reinserire la password:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+"Specificare nuovamente la stessa password per verificare che sia stata "
+"inserita correttamente."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Password errata"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr "Le due password sono diverse. Riprovare."
--- icinga-1.0.2.orig/debian/po/eu.po
+++ icinga-1.0.2/debian/po/eu.po
@@ -0,0 +1,95 @@
+# translation of icinga_1.0.1-3_eu.po to Basque
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <pi@beobide.net>, 2008.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga_1.0.1-3_eu\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-06 11:22+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
+"Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Apache zerbitzariak icinga-rentzako konfiguratzeko:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr ""
+"Hautatu zein Apache zerbitzari konfiguratu behar diren icinga-rentzako."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Konfigurazioa eskuz egitea nahiago baduzu, utzi zerbitzari guztiak hautatu "
+"gabe."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Icinga web administratzailearen pasahitza:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Sartu \"icingaadmin\" erabiltzailearen pasahitza."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Konfigurazioa amaitu ondoren, Icinga zerbitzariarekin konektatzeko erabiliko "
+"diraerabiltzaile-izena eta pasahitza. Ez baduzu pasahitzik ezartzen, Icinga-"
+"ren atzipena eskuz konfiguratu beharko duzu beranduago."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Berretsi pasahitza:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+"Sartu erabiltzailearen pasahitza berriro ongi idatzi duzula ziurtatzeko."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Errorea pasahitzean"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr "Idatzitako bi pasahitzak ez dira berdinak. Saiatu berriro."
--- icinga-1.0.2.orig/debian/po/pl.po
+++ icinga-1.0.2/debian/po/pl.po
@@ -0,0 +1,139 @@
+# debconf templates for ppp package
+# Polish translation
+# Copyright (C) 2008
+# This file is distributed under the same license as the ppp package.
+# Łukasz Paździora <lukpaz@gmail.com>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga 3.0.3-3\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2008-11-20 17:20+0100\n"
+"Last-Translator: Łukasz Paździora <lukpaz@gmail.com>\n"
+"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+#, fuzzy
+#| msgid "Apache servers to configure for icinga:"
+msgid "Apache servers to configure for icinga:"
+msgstr "Konfiguracja serwerów Apache dla icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+#, fuzzy
+#| msgid "Please select which apache servers should be configured for icinga."
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr ""
+"Proszę wybrać, które serwery apache powinny zostać skonfigurowane dla icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Nie zaznaczaj żadnego serwera jeżeli chcesz przeprowadzić konfigurację "
+"ręcznie."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid "Nagios web administration password:"
+msgid "Icinga web administration password:"
+msgstr "Hasło administratora Nagios:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please provide the password to be created with the \"nagiosadmin\" user."
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Proszę podać hasło dla użytkownika \"nagiosadmin\"."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+#, fuzzy
+#| msgid ""
+#| "This is the username and password you will use to log in to your nagios "
+#| "installation after configuration is complete. If you do not provide a "
+#| "password, you will have to configure access to nagios yourself."
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Po zakończeniu konfiguracji ta nazwa użytkownika oraz hasło zostaną użyte do "
+"zalogowania się w nagios. Jeśli hasło nie zostanie podane, konieczne będzie "
+"ręczne skonfigurowanie dostępu do nagios."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
+#~ msgid "Password confirmation:"
+#~ msgstr "Potwierdzenie hasła:"
+
+#~ msgid "The passwords do not match"
+#~ msgstr "Hasła nie są takie same"
+
+#, fuzzy
+#~| msgid "Enable support for nagios 1.x links in icinga?"
+#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgstr "Włączyć obsługę linków z nagios 1.x w icinga?"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please choose whether the Apache configuration for icinga should provide "
+#~| "compatibility with links from nagios 1.x."
+#~ msgid ""
+#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "compatibility with links from nagios 1.x."
+#~ msgstr ""
+#~ "Czy konfiguracja Apache dla icinga powinna być kompatybilna z linkami z "
+#~ "nagios 1.x."
+
+#~ msgid ""
+#~ "If you select this option, the apache configuration used for nagios will "
+#~ "include directives to support URLs from nagios 1.x. You should not choose "
+#~ "this option if you still have nagios 1.x on your system, or unpredictable "
+#~ "results may occur."
+#~ msgstr ""
+#~ "Jeśli ta opcja zostanie wybrana, konfiguracja apache używana dla nagios "
+#~ "będzie zawierać dyrektywy obsługujące URL-e z nagios 1.x. Ta opcja nie "
+#~ "powinna być zaznaczona jeśli nagios 1.x jest nadal zainstalowany na tym "
+#~ "systemie ponieważ może to wywołać niemożliwe do przewidzenia efekty."
--- icinga-1.0.2.orig/debian/po/pt_BR.po
+++ icinga-1.0.2/debian/po/pt_BR.po
@@ -0,0 +1,103 @@
+# icinga Brazilian Portuguese translation.
+# Copyright (C) THE icinga's COPYRIGHT HOLDER
+# This file is distributed under the same license as icinga package.
+# Bruno Gurgel Gomes de Oliveira <bruno@4linux.com.br>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga_3.0.3-1\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-07 11:10-0300\n"
+"Last-Translator: Sergio Cipolla <secipolla@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Servidores Apache a serem configurados para o Icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr ""
+"Por favor, selecione quais servidores Apache deverão ser configurados para o "
+"Icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Se você preferir realizar a configuração manualmente, não selecione nenhum "
+"servidor."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Senha de administração web do Icinga:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Por favor, forneça a senha a ser criada com o usuário \"icingaadmin\"."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Este é o nome de usuário e a senha que você usará para acessar sua "
+"instalação Icinga depois que a configuração estiver completa. Se você não "
+"fornecer uma senha, você terá de configurar manualmente o acesso ao Icinga "
+"posteriormente."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Informe a senha novamente para a verificação."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+"Por favor, informe novamente a mesma senha de usuário para verificar se foi "
+"digitada corretamente."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Erro de entrada da senha"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+"As duas senhas informadas não foram as mesmas. Tente novamente, por favor."
+
+#~ msgid "Password confirmation:"
+#~ msgstr "Confirmação de senha:"
+
+#~ msgid "The passwords do not match"
+#~ msgstr "As senhas não coincidem"
--- icinga-1.0.2.orig/debian/po/pt.po
+++ icinga-1.0.2/debian/po/pt.po
@@ -0,0 +1,134 @@
+# translation of icinga debconf to Portuguese
+# Copyright (C) 2010 the iginga's copyright holder
+# This file is distributed under the same license as the icinga package.
+#
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2007, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga 1.0.1-3\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-06 22:24+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Servidores Apache a configurar para o icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr ""
+"Por favor seleccione quais servidores Apache deverão ser configurados para o "
+"icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Se você preferir efectuar a configuração manualmente, não seleccione nenhum "
+"servidor."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Palavra-passe de administração Web do Icinga:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr ""
+"Por favor indique uma palavra-passe para ser criada com o utilizador "
+"\"icingaadmin\"."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Este é o nome de utilizador e palavra-passe a usar ao ligar ao servidor "
+"Icinga após completar a configuração. Se não disponibilizar uma palavra-"
+"passe, irá ter que configurar manualmente o acesso ao Icinga posteriormente."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Insira de novo a palavra-passe para verificação:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+"Por favor insira de novo correctamente a mesma palavra-passe que escreveu."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Erro de entrada de palavra-passe"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+"As duas palavras-passe que inseriu não são iguais. Por favor tente de novo."
+
+#~ msgid "Password confirmation:"
+#~ msgstr "Confirmação da password:"
+
+#~ msgid "The passwords do not match"
+#~ msgstr "As passwords não condizem."
+
+#, fuzzy
+#~| msgid "Enable support for nagios 1.x links in icinga?"
+#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgstr "Activar suporte para atalhos do nagios 1.x no icinga?"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please choose whether the Apache configuration for icinga should provide "
+#~| "compatibility with links from nagios 1.x."
+#~ msgid ""
+#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "compatibility with links from nagios 1.x."
+#~ msgstr ""
+#~ "Por favor escolha se a configuração do Apache para icinga deverá "
+#~ "providenciar compatibilidade com atalhos do nagios 1.x."
+
+#~ msgid ""
+#~ "If you select this option, the apache configuration used for nagios will "
+#~ "include directives to support URLs from nagios 1.x. You should not choose "
+#~ "this option if you still have nagios 1.x on your system, or unpredictable "
+#~ "results may occur."
+#~ msgstr ""
+#~ "Se seleccionar esta opção, a configuração do apache usada para nagios irá "
+#~ "incluir directivas para suportar URLs do nagios 1.x. Você não deverá "
+#~ "escolher esta opção se ainda tiver o nagios 1.x no seu sistema, ou podem "
+#~ "ocorrer resultados imprevisíveis."
+
+#~ msgid "apache2"
+#~ msgstr "apache2"
--- icinga-1.0.2.orig/debian/po/fr.po
+++ icinga-1.0.2/debian/po/fr.po
@@ -0,0 +1,135 @@
+# French translation of icinga debconf templates
+# Copyright (C) 2006-2010 Debian French l10n Team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the icinga package.
+# Translator:
+# Steve Petruzzello <dlist@bluewin.ch>, 2006-2010
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga_1.0.1-3\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2006-06-07 10:58+0100\n"
+"Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
+"Language-Team: French <debian-l10n-frencg@lists.debian.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Serveurs Apache à configurer pour Icinga :"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr "Veuillez choisir le(s) serveur(s) web à configurer pour Icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Pour effectuer la configuration vous-même, il suffit de ne sélectionner "
+"aucun serveur."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Mot de passe pour l'administration web d'Icinga :"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr ""
+"Veuillez fournir le mot de passe à attribuer à l'identifiant « icingaadmin »."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Il s'agit de l'identifiant et du mot de passe qui devra être utilisé pour se "
+"connecter à Icinga une fois que l'installation sera terminée. Si vous ne "
+"fournissez pas de mot de passe, vous devrez configurer Icinga vous-même afin "
+"d'y accéder."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Confirmation du mot de passe :"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+"Veuillez entrer à nouveau le même mot de passe afin de vérifier qu'il a été "
+"saisi correctement."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Erreur de saisie du mot de passe"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+"Les deux mots de passe que vous avez entrés sont différents. Veuillez "
+"recommencer."
+
+#~ msgid "Password confirmation:"
+#~ msgstr "Confirmation du mot de passe :"
+
+#~ msgid "The passwords do not match"
+#~ msgstr "Mots de passe différents"
+
+#, fuzzy
+#~| msgid "Enable support for nagios 1.x links in icinga?"
+#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgstr "Faut-il activer la gestion des liens de Nagios 1.x pour Nagios3 ?"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please choose whether the Apache configuration for icinga should provide "
+#~| "compatibility with links from nagios 1.x."
+#~ msgid ""
+#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "compatibility with links from nagios 1.x."
+#~ msgstr ""
+#~ "Veuillez choisir si la configuration d'Apache pour Nagios3 doit permettre "
+#~ "la compatibilité avec les liens de Nagios 1.x."
+
+#~ msgid ""
+#~ "If you select this option, the apache configuration used for nagios will "
+#~ "include directives to support URLs from nagios 1.x. You should not choose "
+#~ "this option if you still have nagios 1.x on your system, or unpredictable "
+#~ "results may occur."
+#~ msgstr ""
+#~ "En choisissant cette option, la configuration d'Apache pour Nagios "
+#~ "contiendra des directives permettant la gestion d'URL depuis Nagios 1.x. "
+#~ "Vous ne devriez pas choisir cette option si vous avez encore Nagios 1.x "
+#~ "sur votre système, sinon vous risquez d'avoir des résultats inattendus."
+
+#~ msgid "apache2"
+#~ msgstr "apache2"
+
+#~ msgid "false"
+#~ msgstr "Faux"
--- icinga-1.0.2.orig/debian/po/vi.po
+++ icinga-1.0.2/debian/po/vi.po
@@ -0,0 +1,90 @@
+# Vietnamese translation for Icinga.
+# Copyright © 2010 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga 1.0.1-3\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-13 23:02+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Trình phục vụ Apache cần cấu hình cho icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr "Hãy chọn những trình phục vụ Apache nào cần cấu hình cho icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Nếu bạn muốn tự cấu hình thì để lại tất cả các trình phục vụ bị bỏ chọn."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Mật khẩu quản trị Web Icinga:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Hãy cung cấp mật khẩu cần tạo với người dùng quản trị « icingaadmin »."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Đây là tên người dùng và mật khẩu cần dùng khi kết nối đến máy phục vụ "
+"Icinga sau khi hoàn tất cấu hình. Không cung cấp mật khẩu thì bạn cần phải "
+"tự cấu hình chức năng truy cập đến Icinga về sau."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Gõ lại mật khẩu để thẩm tra:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr "Hãy nhập lại mật khầu người dùng mới nhập, để xác nhận bạn đã gõ đúng."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Lỗi nhập mật khẩu"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr "Bạn đã nhập hai mật khẩu không trùng nhau. Hãy thử lại."
--- icinga-1.0.2.orig/debian/po/es.po
+++ icinga-1.0.2/debian/po/es.po
@@ -0,0 +1,119 @@
+# icinga po-debconf translation to spanish
+# Copyright (C) 2004-2010 Software in the Public Interest
+# This file is distributed under the same license as the icinga package.
+#
+# Changes:
+# - Initial translation
+# Rudy Godoy <rudy@kernel-panik.org>, 2006
+#
+# - Updates
+# Omar Campagne <ocampagne@gmail.com>, 2010
+#
+# Traductores, si no conoce el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/coordinacion
+# especialmente las notas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga 2.5\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-06 18:43+0200\n"
+"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"org>\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Servidores apache a configurar para icinga:"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr ""
+"Seleccione los servidores apache que se deberían configurar para icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"No elija ningún servidor si prefiere realizar la configuración de forma "
+"manual."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Contraseña para la administración web de icinga:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr "Introduzca la contraseña para el nuevo usuario «icingaadmin»."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Estos son el usuario y contraseña que usará para identificarse en su "
+"instalación de icinga, una vez que la configuración se haya completado. Si "
+"no define una contraseña tendrá que configurar icinga de forma manual."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Introduzca la contraseña otra vez para su comprobación:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+"Introduzca otra vez la misma contraseña de usuario para comprobar que la ha "
+"tecleado correctamente."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Se ha detectado un fallo al introducir la contraseña"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+"Las dos contraseñas que ha introducido no son idénticas. Inténtelo otra vez."
--- icinga-1.0.2.orig/debian/po/da.po
+++ icinga-1.0.2/debian/po/da.po
@@ -0,0 +1,93 @@
+# Danish translation icinga.
+# Copyright (C) 2010 icinga & Joe Hansen.
+# This file is distributed under the same license as the icinga package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: icinga\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: 2010-05-05 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr "Apacheservere der skal konfigureres til icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr "Vælg venligst hvilke Apacheservere der skal konfigureres til icinga."
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+"Hvis du foretrækker at udføre manuel konfiguration, så vælg ingen servere."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr "Adgangskode for icingainternetadministration:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr ""
+"Indtast venligst adgangskoden som skal oprettes med brugeren »icingaadmin«."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+"Dette er brugernavnet og adgangskoden, der skal bruges, når der forbindes "
+"til Icingaserverne efter færdiggørelse af konfigurationen. Hvis du ikke "
+"indtaster en adgangskode, skal du manuelt konfigurere adgang til Icinga på "
+"et senere tidspunkt."
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr "Genindtast adgangskode som verificering:"
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+"Indtast venligst den samme adgangskode igen for at verificere at du har "
+"indtastet den korrekt."
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr "Inddatafejl for adgangskode"
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr "De to adgangskoder du indtastede var ikke ens. Forsøg igen."
--- icinga-1.0.2.orig/debian/po/templates.pot
+++ icinga-1.0.2/debian/po/templates.pot
@@ -0,0 +1,85 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: icinga@packages.debian.org\n"
+"POT-Creation-Date: 2010-05-06 08:46+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Apache servers to configure for icinga:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid "Please select which Apache servers should be configured for icinga."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../icinga-cgi.templates:2001
+msgid ""
+"If you would prefer to perform configuration manually, leave all servers "
+"unselected."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid "Icinga web administration password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"Please provide the password to be created with the \"icingaadmin\" user."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:3001
+msgid ""
+"This is the username and password to use when connecting to the Icinga "
+"server after completing the configuration. If you do not provide a password, "
+"you will have to configure access to Icinga manually later on."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid "Re-enter password to verify:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../icinga-cgi.templates:4001
+msgid ""
+"Please enter the same user password again to verify you have typed it "
+"correctly."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../icinga-cgi.templates:5001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
--- icinga-1.0.2.orig/debian/source/format
+++ icinga-1.0.2/debian/source/format
@@ -0,0 +1 @@
+1.0
![[patchlogo]](http://patch-tracker.debian.org/static/img/swirlpatch.png)