svn commit: r337029 - in head/net-mgmt/icinga: . files
Lars Engels
lme at FreeBSD.org
Fri Dec 20 16:05:54 UTC 2013
Author: lme
Date: Fri Dec 20 16:05:51 2013
New Revision: 337029
URL: http://svnweb.freebsd.org/changeset/ports/337029
Log:
Big cleanup for the icinga port:
- Update to 1.10.2
- Stagify
- Use new LIB_DEPENDS syntax
- Add USES gmake
- Remove a lot of no longer needed variables and logic from the old nagios port
- Install Apache 2.x configuration examples by default, no longer provide an
option to depend on www/apache22 to be more flexible
- Use ports system's own way to add and remove users and groups. Remove pkg-{de,}install
- Don't use the install-commandmode make target. ICINGADIR and ICINGALOGDIR are now created
from the icinga rc-script
- Remove embedded Perl option which is considered broken by the developers
- Remove UNHANDLED_HACK option - another relict from the old nagios port.
Added:
head/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in (contents, props changed)
Deleted:
head/net-mgmt/icinga/files/pkg-deinstall.in
head/net-mgmt/icinga/files/pkg-install.in
Modified:
head/net-mgmt/icinga/Makefile
head/net-mgmt/icinga/distinfo
head/net-mgmt/icinga/files/icinga.in (contents, props changed)
head/net-mgmt/icinga/files/patch-Makefile.in (contents, props changed)
head/net-mgmt/icinga/files/patch-base-Makefile.in (contents, props changed)
head/net-mgmt/icinga/files/patch-cgi-Makefile.in (contents, props changed)
head/net-mgmt/icinga/files/patch-configure.in (contents, props changed)
head/net-mgmt/icinga/files/patch-contrib-Makefile.in (contents, props changed)
head/net-mgmt/icinga/files/patch-include_config.h.in (contents, props changed)
head/net-mgmt/icinga/files/patch-module-idoutils-src-Makefile.in (contents, props changed)
head/net-mgmt/icinga/files/patch-sample-config-template-object-localhost.cfg.in (contents, props changed)
head/net-mgmt/icinga/files/patch-sample-config-template-object-templates.cfg.in (contents, props changed)
head/net-mgmt/icinga/files/pkg-message.in (contents, props changed)
head/net-mgmt/icinga/pkg-plist
Modified: head/net-mgmt/icinga/Makefile
==============================================================================
--- head/net-mgmt/icinga/Makefile Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/Makefile Fri Dec 20 16:05:51 2013 (r337029)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= icinga
-PORTVERSION= 1.9.3
-PORTREVISION= 2
+PORTVERSION= 1.10.2
CATEGORIES= net-mgmt
MASTER_SITES= SF
@@ -12,10 +11,10 @@ COMMENT= Enterprise grade open source mo
LICENSE= GPLv2
-LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd
RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
-USES= iconv
+USES= iconv gmake
USE_AUTOTOOLS= autoconf libltdl
USE_RC_SUBR= icinga
@@ -23,15 +22,12 @@ GNU_CONFIGURE= yes
ICINGAUSER?= icinga
ICINGAGROUP?= icinga
+USERS= ${ICINGAUSER}
+GROUPS= ${ICINGAGROUP}
ICINGADIR?= /var/spool/icinga
ICINGALOGDIR?= /var/log/icinga
-ICINGAUID= 183
-ICINGAGID= ${ICINGAUID}
-
ICINGAWWWDIR?= www/icinga
-ICINGAHTMURL?= /icinga
-ICINGACGIURL?= ${ICINGAHTMURL}/cgi-bin
CPPFLAGS+= -I${LOCALBASE}/include -fPIC
CFLAGS+= ${CPPFLAGS}
@@ -40,8 +36,6 @@ CONFIGURE_ARGS= --with-command-user=${IC
--with-command-group=${WWWGRP} \
--with-icinga-user=${ICINGAUSER} \
--with-icinga-group=${ICINGAGROUP} \
- --with-htmurl=${ICINGAHTMURL} \
- --with-cgiurl=${ICINGACGIURL} \
--sbindir=${PREFIX}/${ICINGAWWWDIR}/cgi-bin \
--datarootdir=${PREFIX}/${ICINGAWWWDIR} \
--datadir=${PREFIX}/${ICINGAWWWDIR} \
@@ -51,61 +45,38 @@ CONFIGURE_ARGS= --with-command-user=${IC
--libexecdir=${PREFIX}/libexec/icinga \
--with-plugin-dir=${LOCALBASE}/libexec/nagios \
--with-log-dir=${ICINGALOGDIR} \
- --enable-event-broker
+ --with-httpd-conf=${EXAMPLESDIR}/apache22 \
+ --enable-event-broker \
+ --enable-nanosleep
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
PERL=${PERL}
-INSTALL_TARGET= install install-commandmode install-config \
- install-eventhandlers
+INSTALL_TARGET= install install-config install-eventhandlers install-webconf
PLIST_SUB= ICINGADIR=${ICINGADIR} \
ICINGALOGDIR=${ICINGALOGDIR} \
ICINGAWWWDIR=${ICINGAWWWDIR} \
ICINGAUSER=${ICINGAUSER} \
ICINGAGROUP=${ICINGAGROUP} \
- ICINGAUID=${ICINGAUID} \
- ICINGAGID=${ICINGAGID} \
- ICINGAHTMURL=${ICINGAHTMURL} \
ICINGACGIURL=${ICINGACGIURL} \
WWWGRP=${WWWGRP}
-SUB_FILES= pkg-install \
- pkg-deinstall \
- pkg-message
+SUB_FILES= pkg-message
# XXX: Don't remove PREFIX from SUB_LIST here.
SUB_LIST= PREFIX=${PREFIX} \
${PLIST_SUB}
-OPTIONS_DEFINE= EMBEDDED_PERL NANOSLEEP UNHANDLED_HACK IDOUTILS APACHE EXAMPLES
-OPTIONS_DEFAULT= EMBEDDED_PERL IDOUTILS
+OPTIONS_DEFINE= IDOUTILS
+OPTIONS_DEFAULT= IDOUTILS
-EMBEDDED_PERL_DESC= Enable embedded Perl
-NANOSLEEP_DESC= Use nanosleep(2) in event timing
-UNHANDLED_HACK_DESC= Display passive checks in unhandled queries
IDOUTILS_DESC= Enable Icinga Data Objects support
-APACHE_DESC= Depend on Apache and install webconfig
-NO_STAGE= yes
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MEMBEDDED_PERL}
-USES+= perl5
-USE_PERL5= build
-CONFIGURE_ARGS+= --enable-embedded-perl \
- --with-perlcache
-PLIST_SUB+= EMBEDDED_PERL=""
-.else
-PLIST_SUB+= EMBEDDED_PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNANOSLEEP}
-CONFIGURE_ARGS+= --enable-nanosleep
-.endif
-
.if ${PORT_OPTIONS:MIDOUTILS}
-LIB_DEPENDS+= dbi:${PORTSDIR}/databases/libdbi-drivers
+LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi-drivers
CONFIGURE_ARGS+= --enable-idoutils \
--enable-ssl \
--with-dbi-lib=${LOCALBASE}/lib \
@@ -118,15 +89,6 @@ PLIST_SUB+= IDOUTILS="@comment "
CONFIGURE_ARGS+= --disable-idoutils
.endif
-.if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN= 22+
-CONFIGURE_ARGS+= --with-httpd-conf=${LOCALBASE}/${APACHEETCDIR}/extra
-INSTALL_TARGET+= install-webconf
-PLIST_SUB+= APACHE=""
-.else
-PLIST_SUB+= APACHE="@comment "
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's#/bin/ping#/sbin/ping#' \
${WRKSRC}/sample-config/cgi.cfg.in
@@ -134,35 +96,18 @@ post-patch:
${WRKSRC}/sample-config/icinga.cfg.in
@${REINPLACE_CMD} -e 's#775#755#g; s#664#644#g' \
${WRKSRC}/html/Makefile.in
-.if ${PORT_OPTIONS:MUNHANDLED_HACK}
- @${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
- -e 's#;hostprops=42\"#;hostprops=10\"#g' \
- ${WRKSRC}/html/menu.html.in
-.endif
# Use correct make(1) syntax to unbreak parallel builds
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
-E 's#cd (.+) && (make|\$$\(MAKE\))#$$(MAKE) -C \1#'
-pre-su-install:
- @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
-
post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
- ${MKDIR} ${EXAMPLESDIR}/idoutils/
- ${MKDIR} ${EXAMPLESDIR}/idoutils/config/
- ${MKDIR} ${EXAMPLESDIR}/idoutils/db
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${ICINGAWWWDIR}/ssi
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/config/
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/db
cd ${WRKSRC}/module/idoutils/config && ${COPYTREE_SHARE} . \
- ${EXAMPLESDIR}/idoutils/config
+ ${STAGEDIR}${EXAMPLESDIR}/idoutils/config
cd ${WRKSRC}/module/idoutils/db && ${COPYTREE_SHARE} . \
- ${EXAMPLESDIR}/idoutils/db
-.endif
- @${CHMOD} 775 ${ICINGADIR} ${ICINGALOGDIR}/archives \
- ${ICINGADIR}/checkresults ${ICINGADIR}/rw
- @${CHOWN} ${ICINGAUSER}:${ICINGAGROUP} ${ICINGADIR} \
- ${ICINGALOGDIR}/archives ${ICINGADIR}/checkresults
- @${CHOWN} ${ICINGAUSER}:${WWWGRP} ${ICINGADIR}/rw
- @${ECHO_MSG}
- @${CAT} ${PKGMESSAGE}
- @${ECHO_MSG}
+ ${STAGEDIR}${EXAMPLESDIR}/idoutils/db
.include <bsd.port.mk>
Modified: head/net-mgmt/icinga/distinfo
==============================================================================
--- head/net-mgmt/icinga/distinfo Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/distinfo Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,2 +1,2 @@
-SHA256 (icinga-1.9.3.tar.gz) = 2dfef14225e8b671145d4816999bf57842d379b2e5e18d2af69cf0c5b93376db
-SIZE (icinga-1.9.3.tar.gz) = 17082275
+SHA256 (icinga-1.10.2.tar.gz) = fa50e249b75022f49104f98c0d35ff66e33bd937db6255ae79c0728344efce0f
+SIZE (icinga-1.10.2.tar.gz) = 15295911
Modified: head/net-mgmt/icinga/files/icinga.in
==============================================================================
--- head/net-mgmt/icinga/files/icinga.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/icinga.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -30,13 +30,16 @@ load_rc_config "${name}"
command="%%PREFIX%%/bin/icinga"
command_args="-d"
extra_commands="reload checkconfig configtest"
-pidfile="%%ICINGADIR%%/icinga.lock"
icinga_user="%%ICINGAUSER%%"
icinga_group="%%ICINGAGROUP%%"
-icinga_logfile="%%ICINGALOGDIR%%/${name}.log"
-icinga_statusfile="%%ICINGADIR%%/status.sav"
-icinga_cmdfile="%%ICINGADIR%%/rw/${name}.cmd"
+icinga_dir="%%ICINGADIR%%"
+icinga_logdir="%%ICINGALOGDIR%%"
+
+pidfile="${icinga_dir}/icinga.lock"
+icinga_logfile="${icinga_logdir}/${name}.log"
+icinga_statusfile="${icinga_dir}/status.sav"
+icinga_cmdfile="${icinga_dir}/rw/${name}.cmd"
start_cmd="start_cmd"
checkconfig_cmd="icinga_checkconfig verbose"
@@ -69,7 +72,7 @@ icinga_cacheconfig() {
icinga_checkconfig() {
echo -n "Performing sanity check of icinga configuration: "
-
+
if [ "$1" != "verbose" ]; then
${command} -v ${icinga_configfile} 2>&1 >/dev/null
else
@@ -97,6 +100,19 @@ reload_precmd() {
}
start_precmd() {
+ for d in "${icinga_dir}" \
+ "${icinga_dir}/checkresults" \
+ "${icinga_logdir}" \
+ "${icinga_logdir}/archives"; do
+ if [ ! -d "${d}" ]; then
+ install -d -o "${icinga_user}" -g "${icinga_group}" "${icinga_dir}"/checkresults
+ fi
+ done
+
+ if [ ! -d "${icingadir}/rw" ]; then
+ install -d -o "${icinga_user}" -g "%%WWWGRP%%" "${icinga_dir}"/rw
+ fi
+
if ! icinga_checkconfig; then
return 1
fi
@@ -115,7 +131,7 @@ start_precmd() {
}
stop_postcmd() {
- rm -f "%%ICINGADIR%%/icinga.tmp" "${icinga_cmdfile}"
+ rm -f "${icinga_dir}/icinga.tmp" "${icinga_cmdfile}"
}
start_cmd() {
Modified: head/net-mgmt/icinga/files/patch-Makefile.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-Makefile.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-Makefile.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,6 +1,204 @@
---- Makefile.in.orig 2013-05-10 08:48:51.000000000 +0200
-+++ Makefile.in 2013-05-10 08:50:03.000000000 +0200
-@@ -427,8 +427,8 @@ install-basic:
+--- Makefile.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ Makefile.in 2013-12-19 17:32:03.300358603 +0100
+@@ -141,16 +141,16 @@ none:
+ ###############################
+
+ all:
+- cd $(SRC_BASE) && $(MAKE)
+- cd $(SRC_CGI) && $(MAKE)
+- cd $(SRC_HTM) && $(MAKE)
++ $(MAKE) -C $(SRC_BASE)
++ $(MAKE) -C $(SRC_CGI)
++ $(MAKE) -C $(SRC_HTM)
+
+ if [ x$(USE_EVENTBROKER) = xyes ]; then \
+- cd $(SRC_MODULE) && $(MAKE); \
++ $(MAKE) -C $(SRC_MODULE); \
+ fi
+
+ @if [ x$(USE_IDOUTILS) = xyes ]; then \
+- cd $(SRC_IDOUTILS) && $(MAKE); \
++ $(MAKE) -C $(SRC_IDOUTILS); \
+ fi
+
+ @echo ""
+@@ -218,7 +218,7 @@ all:
+ @echo ""
+
+ icinga:
+- cd $(SRC_BASE) && $(MAKE)
++ $(MAKE) -C $(SRC_BASE)
+
+ config:
+ @echo "Sample config files are automatically generated once you run the"
+@@ -226,11 +226,11 @@ config:
+ @echo "system by using the 'make install-config' command."
+
+ cgis:
+- cd $(SRC_CGI) && $(MAKE)
++ $(MAKE) -C $(SRC_CGI)
+
+ idoutils:
+ @if [ x$(USE_IDOUTILS) = xyes ]; then \
+- cd $(SRC_IDOUTILS) && $(MAKE); \
++ $(MAKE) -C $(SRC_IDOUTILS); \
+ else \
+ echo "" ;\
+ echo "Sorry, IDOUtils not enabled!" ;\
+@@ -239,13 +239,13 @@ idoutils:
+ fi
+
+ html:
+- cd $(SRC_HTM) && $(MAKE)
++ $(MAKE) -C $(SRC_HTM)
+
+ contrib:
+- cd $(SRC_CONTRIB) && $(MAKE)
++ $(MAKE) -C $(SRC_CONTRIB)
+
+ modules:
+- cd $(SRC_MODULE) && $(MAKE)
++ $(MAKE) -C $(SRC_MODULE)
+
+ classicui-standalone: cgis
+
+@@ -259,35 +259,35 @@ classicui-standalone: cgis
+ ###############################
+
+ clean:
+- cd $(SRC_BASE) && $(MAKE) $@
+- cd $(SRC_CGI) && $(MAKE) $@
+- cd $(SRC_COMMON) && $(MAKE) $@
+- cd $(SRC_XDATA) && $(MAKE) $@
+- cd $(SRC_HTM) && $(MAKE) $@
+- cd $(SRC_INCLUDE) && $(MAKE) $@
+- cd $(SRC_CONTRIB) && $(MAKE) $@
+- cd $(SRC_MODULE) && $(MAKE) $@
+- cd $(SRC_IDOUTILS) && $(MAKE) $@
+- cd $(SRC_TTAP) && $(MAKE) $@
+- cd $(SRC_T) && $(MAKE) $@
+- cd $(SRC_TAP) && $(MAKE) $@; \
++ $(MAKE) -C $(SRC_BASE) $@
++ $(MAKE) -C $(SRC_CGI) $@
++ $(MAKE) -C $(SRC_COMMON) $@
++ $(MAKE) -C $(SRC_XDATA) $@
++ $(MAKE) -C $(SRC_HTM) $@
++ $(MAKE) -C $(SRC_INCLUDE) $@
++ $(MAKE) -C $(SRC_CONTRIB) $@
++ $(MAKE) -C $(SRC_MODULE) $@
++ $(MAKE) -C $(SRC_IDOUTILS) $@
++ $(MAKE) -C $(SRC_TTAP) $@
++ $(MAKE) -C $(SRC_T) $@
++ $(MAKE) -C $(SRC_TAP) $@; \
+
+ rm -f *.cfg core
+ rm -f *~ *.*~ */*~ */*.*~ */*/*.*~
+
+ distclean: clean
+- cd $(SRC_BASE) && $(MAKE) $@
+- cd $(SRC_CGI) && $(MAKE) $@
+- cd $(SRC_COMMON) && $(MAKE) $@
+- cd $(SRC_XDATA) && $(MAKE) $@
+- cd $(SRC_HTM) && $(MAKE) $@
+- cd $(SRC_INCLUDE) && $(MAKE) $@
+- cd $(SRC_CONTRIB) && $(MAKE) $@
+- cd $(SRC_MODULE) && $(MAKE) $@
+- cd $(SRC_IDOUTILS) && $(MAKE) $@
+- cd $(SRC_TTAP) && $(MAKE) $@
+- cd $(SRC_T) && $(MAKE) $@
+- cd $(SRC_TAP) && $(MAKE) $@; \
++ $(MAKE) -C $(SRC_BASE) $@
++ $(MAKE) -C $(SRC_CGI) $@
++ $(MAKE) -C $(SRC_COMMON) $@
++ $(MAKE) -C $(SRC_XDATA) $@
++ $(MAKE) -C $(SRC_HTM) $@
++ $(MAKE) -C $(SRC_INCLUDE) $@
++ $(MAKE) -C $(SRC_CONTRIB) $@
++ $(MAKE) -C $(SRC_MODULE) $@
++ $(MAKE) -C $(SRC_IDOUTILS) $@
++ $(MAKE) -C $(SRC_TTAP) $@
++ $(MAKE) -C $(SRC_T) $@
++ $(MAKE) -C $(SRC_TAP) $@; \
+
+ rm -f sample-config/*.cfg sample-config/*.conf sample-config/template-object/*.cfg
+ rm -f daemon-init pkginfo rc.ido2db ido2db-systemd icinga-systemd sysconfig-env
+@@ -308,13 +308,13 @@ test:
+ $(MAKE) test-tap
+
+ test-tap: tools/libtap/tap.o icinga cgis
+- cd $(SRC_TTAP) && $(MAKE) test;
++ $(MAKE) -C $(SRC_TTAP) test;
+
+ tools/libtap/tap.o:
+- cd tools/libtap && $(MAKE)
++ $(MAKE) -C tools/libtap
+
+ test-perl: icinga cgis
+- cd t && $(MAKE) test
++ $(MAKE) -C t test
+
+ ###############################
+ # Package
+@@ -328,8 +328,8 @@ create-docs: copy-docs-style
+ #${MAKE} submodule-init
+ #${MAKE} submodule-update
+ #${MAKE} submodule-update-latest
+- cd ${SRC_DOCBOOK_EN} && make en
+- cd ${SRC_DOCBOOK_DE} && make de
++ $(MAKE) -C ${SRC_DOCBOOK_EN} en
++ $(MAKE) -C ${SRC_DOCBOOK_DE} de
+ cp ${SRC_DOCBOOK_IMAGES}/*.png ${SRC_DOCS_IMAGES}/
+ @echo "updated docs :)"
+
+@@ -366,37 +366,33 @@ submodule-update-latest:
+
+
+ install-html:
+- cd $(SRC_HTM) && $(MAKE) install
++ $(MAKE) -C $(SRC_HTM) install
+
+ install-dev-docu:
+- cd $(SRC_HTM) && $(MAKE) install-dev-docu
++ $(MAKE) -C $(SRC_HTM) install-dev-docu
+
+ install-base:
+- cd $(SRC_BASE) && $(MAKE) install
++ $(MAKE) -C $(SRC_BASE) install
+
+ install-cgis:
+- cd $(SRC_CGI) && $(MAKE) install
++ $(MAKE) -C $(SRC_CGI) install
+
+ install:
+- cd $(SRC_BASE) && $(MAKE) $@
+- cd $(SRC_CGI) && $(MAKE) $@
+- cd $(SRC_HTM) && $(MAKE) $@
++ $(MAKE) -C $(SRC_BASE) $@
++ $(MAKE) -C $(SRC_CGI) $@
++ $(MAKE) -C $(SRC_HTM) $@
+
+ $(MAKE) install-basic
+
+ install-unstripped:
+- cd $(SRC_BASE) && $(MAKE) $@
+- cd $(SRC_CGI) && $(MAKE) $@
+- cd $(SRC_HTM) && $(MAKE) $@
++ $(MAKE) -C $(SRC_BASE) $@
++ $(MAKE) -C $(SRC_CGI) $@
++ $(MAKE) -C $(SRC_HTM) $@
+
+ $(MAKE) install-basic
+
+ install-basic:
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR)
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
+ if [ $(INSTALLPERLSTUFF) = yes ]; then \
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(P1FILELOC); \
+ $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(P1FILELOC); \
+@@ -439,8 +435,8 @@ install-basic:
install-cgiconf:
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
@@ -11,7 +209,7 @@
install-config: install-cgiconf
-@@ -436,17 +436,17 @@ install-config: install-cgiconf
+@@ -448,17 +444,17 @@ install-config: install-cgiconf
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
@@ -40,21 +238,30 @@
@echo ""
@echo "*** Config files installed ***"
-@@ -464,7 +464,7 @@ install-testconfig:
+@@ -476,7 +472,7 @@ install-testconfig:
install-webconf:
$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
- $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)-sample
-
- @echo ""
- @echo "*** Icinga/Apache conf file installed ***"
-@@ -472,7 +472,7 @@ install-webconf:
-
+ @if [ x$(APACHE24_DEBIAN) = xyes ]; then \
+ echo " Debian Apache 2.4 detected. " ;\
+ echo " Run 'a2enconf icinga' and 'service apache2 reload'" ;\
+@@ -489,7 +485,7 @@ install-webconf:
install-webconf-auth:
+ $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
- $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)-sample
@echo ""
@echo "*** Icinga http auth file installed ***"
+@@ -498,7 +494,7 @@ install-webconf-auth:
+
+ install-idoutils:
+ @if [ x$(USE_IDOUTILS) = xyes ]; then \
+- cd $(SRC_IDOUTILS) && $(MAKE) $@ ;\
++ $(MAKE) -C $(SRC_IDOUTILS) $@ ;\
+ fi
+ @if [ x$(USE_IDOUTILS) = xyes ]; then \
+ echo "" ;\
Modified: head/net-mgmt/icinga/files/patch-base-Makefile.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-base-Makefile.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-base-Makefile.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,6 +1,6 @@
---- base/Makefile.in.orig 2013-05-10 10:15:47.000000000 +0200
-+++ base/Makefile.in 2013-05-10 10:16:17.000000000 +0200
-@@ -207,8 +207,8 @@ install-unstripped:
+--- base/Makefile.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ base/Makefile.in 2013-12-06 17:20:50.030138556 +0100
+@@ -215,8 +215,8 @@ install-unstripped:
$(MAKE) install-basic
install-basic:
Modified: head/net-mgmt/icinga/files/patch-cgi-Makefile.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-cgi-Makefile.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-cgi-Makefile.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,6 +1,6 @@
---- cgi/Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
-+++ cgi/Makefile.in 2012-05-16 19:18:25.683923624 +0000
-@@ -199,10 +199,10 @@
+--- cgi/Makefile.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ cgi/Makefile.in 2013-12-06 17:20:50.024138129 +0100
+@@ -204,10 +204,10 @@ install-unstripped:
$(MAKE) install-basic
install-basic:
Modified: head/net-mgmt/icinga/files/patch-configure.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-configure.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-configure.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,14 +1,14 @@
---- configure.in.orig 2012-05-15 13:00:56.000000000 +0000
-+++ configure.in 2012-05-16 21:05:28.973178226 +0000
-@@ -6,7 +6,6 @@
+--- configure.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ configure.in 2013-12-06 17:22:07.285134852 +0100
+@@ -6,7 +6,6 @@ define([AC_CACHE_SAVE],)
AC_INIT(base/icinga.c)
AC_CONFIG_HEADER(include/config.h)
-AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
- PKG_VERSION="1.7.0"
-@@ -144,6 +143,15 @@
+ PKG_VERSION="1.10.2"
+@@ -144,6 +143,15 @@ AC_TRY_COMPILE([#include <stdlib.h>
dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
THREADLIBS=""
have_pthreads="no"
@@ -24,7 +24,7 @@
dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad at yahoo-inc.com>
dnl FreeBSD -pthread check - Jonathan McDowell <noodles at earth.li>
-@@ -205,6 +213,7 @@
+@@ -205,6 +213,7 @@ dnl all other thread tests fail, try BSD
if test $have_pthreads = "no"; then
AC_PTHREAD_FREEBSD
fi
@@ -32,16 +32,15 @@
AC_SUBST(THREADLIBS)
-@@ -223,7 +232,7 @@
+@@ -223,7 +232,6 @@ AC_DEFINE_UNQUOTED(DEFAULT_ICINGA_USER,"
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$icinga_user",[user name to run nagios])
AC_DEFINE_UNQUOTED(DEFAULT_ICINGA_GROUP,"$icinga_grp",[group name to run nagios])
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$icinga_grp",[group name to run nagios])
-INSTALL_OPTS="-o $icinga_user -g $icinga_grp"
-+INSTALL_OPTS="-o root -g wheel"
AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$icinga_user)
-@@ -414,7 +423,7 @@
+@@ -443,7 +451,7 @@ dnl Location of the embedded perl p1.pl
P1FILELOC=no
AC_ARG_WITH(p1-file-dir,AC_HELP_STRING([--with-p1-file-dir=<path>],[sets path to embedded perl p1.pl directory]),P1FILELOC=$withval,P1FILELOC=no)
if test x$P1FILELOC = xno; then
@@ -50,7 +49,7 @@
fi
AC_SUBST(P1FILELOC)
-@@ -1033,6 +1042,9 @@
+@@ -1097,6 +1105,9 @@ if test x$USEPERL = xyes; then
AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
Modified: head/net-mgmt/icinga/files/patch-contrib-Makefile.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-contrib-Makefile.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-contrib-Makefile.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,6 +1,6 @@
---- contrib/Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
-+++ contrib/Makefile.in 2012-05-16 19:18:25.684923160 +0000
-@@ -52,10 +52,10 @@
+--- contrib/Makefile.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ contrib/Makefile.in 2013-12-06 17:20:50.028144909 +0100
+@@ -63,10 +63,10 @@ distclean: clean
devclean: distclean
install:
@@ -15,3 +15,12 @@
##############################################################################
# rules and dependencies for actual target programs
+@@ -96,7 +96,7 @@ dst: dst.c
+ # dependencies
+
+ $(CGI_O): $(CGI_C)
+- cd $(SRC_CGI) && make $(CGI_O)
++ $(MAKE) -C $(SRC_CGI) $(CGI_O)
+
+ ##############################################################################
+ # implicit rules
Modified: head/net-mgmt/icinga/files/patch-include_config.h.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-include_config.h.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-include_config.h.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,6 +1,6 @@
---- include/config.h.in.orig 2012-05-25 21:46:46.000000000 +0200
-+++ include/config.h.in 2012-05-25 21:47:05.000000000 +0200
-@@ -222,10 +222,12 @@
+--- include/config.h.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ include/config.h.in 2013-12-06 17:20:49.747139208 +0100
+@@ -218,10 +218,12 @@
#include <errno.h>
#endif
Added: head/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -0,0 +1,9 @@
+--- module/idoutils/Makefile.in.orig 2013-12-20 16:25:54.111654088 +0100
++++ module/idoutils/Makefile.in 2013-12-20 16:26:06.033654590 +0100
+@@ -60,5 +60,5 @@
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg
++ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg-sample
+
Modified: head/net-mgmt/icinga/files/patch-module-idoutils-src-Makefile.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-module-idoutils-src-Makefile.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-module-idoutils-src-Makefile.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,6 +1,6 @@
---- module/idoutils/src/Makefile.in.orig 2013-05-10 10:17:03.000000000 +0200
-+++ module/idoutils/src/Makefile.in 2013-05-10 10:17:26.000000000 +0200
-@@ -112,8 +112,8 @@ install:
+--- module/idoutils/src/Makefile.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ module/idoutils/src/Makefile.in 2013-12-06 17:20:50.031138208 +0100
+@@ -116,8 +116,8 @@ install:
@echo "Going to uninstall old idomod.o in $(DESTDIR)$(BINDIR)/idomod.o ..."
rm -f $(DESTDIR)$(BINDIR)/idomod.o
@echo "Resuming with install..."
Modified: head/net-mgmt/icinga/files/patch-sample-config-template-object-localhost.cfg.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-sample-config-template-object-localhost.cfg.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-sample-config-template-object-localhost.cfg.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,6 +1,6 @@
---- sample-config/template-object/localhost.cfg.in.orig Sun Jun 10 02:13:05 2007
-+++ sample-config/template-object/localhost.cfg.in Fri Jul 20 13:46:46 2007
-@@ -5,7 +5,7 @@
+--- sample-config/template-object/localhost.cfg.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ sample-config/template-object/localhost.cfg.in 2013-12-06 17:20:49.754148157 +0100
+@@ -3,7 +3,7 @@
#
# NOTE: This config file is intended to serve as an *extremely* simple
# example of how you can create configuration entries to monitor
@@ -9,7 +9,7 @@
#
###############################################################################
-@@ -23,9 +23,9 @@
+@@ -21,9 +21,9 @@
# Define a host for the local machine
define host{
@@ -21,7 +21,7 @@
host_name localhost
alias localhost
address 127.0.0.1
-@@ -41,12 +41,12 @@
+@@ -39,12 +39,12 @@ define host{
###############################################################################
###############################################################################
Modified: head/net-mgmt/icinga/files/patch-sample-config-template-object-templates.cfg.in
==============================================================================
--- head/net-mgmt/icinga/files/patch-sample-config-template-object-templates.cfg.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/patch-sample-config-template-object-templates.cfg.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,6 +1,6 @@
---- sample-config/template-object/templates.cfg.in.orig Fri Jul 20 13:46:57 2007
-+++ sample-config/template-object/templates.cfg.in Fri Jul 20 13:47:52 2007
-@@ -63,17 +63,17 @@
+--- sample-config/template-object/templates.cfg.in.orig 2013-12-05 12:51:35.000000000 +0100
++++ sample-config/template-object/templates.cfg.in 2013-12-06 17:20:49.759139643 +0100
+@@ -61,17 +61,17 @@ define host{
}
Modified: head/net-mgmt/icinga/files/pkg-message.in
==============================================================================
--- head/net-mgmt/icinga/files/pkg-message.in Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/files/pkg-message.in Fri Dec 20 16:05:51 2013 (r337029)
@@ -11,9 +11,9 @@
If you don't already have a web server running, you will need to
install and configure one to finish off your Icinga installation.
- If you selected APACHE in Icinga's OPTION screen, the configuration
- is already installed as %%LOCALBASE%%/etc/apache22/extra/icinga.conf
- and you only need to source the configuration file in Apache's config.
+
+ A sample Apache 2.x configuration is installed as
+ %%PREFIX%%/%%EXAMPLESDIR%%/apache22/icinga.conf-sample
If you like to use database backend with IDOutils the SQL scripts to
setup the database have been installed in
Modified: head/net-mgmt/icinga/pkg-plist
==============================================================================
--- head/net-mgmt/icinga/pkg-plist Fri Dec 20 16:05:34 2013 (r337028)
+++ head/net-mgmt/icinga/pkg-plist Fri Dec 20 16:05:51 2013 (r337029)
@@ -1,24 +1,16 @@
- at exec mkdir -p %D/%%ICINGAWWWDIR%%/ssi
- at exec mkdir -p %%ICINGALOGDIR%%/archives
- at exec mkdir -p %%ICINGADIR%%/checkresults
- at exec mkdir -p %%ICINGADIR%%/rw
- at exec chmod 775 %%ICINGADIR%% %%ICINGALOGDIR%%/archives %%ICINGADIR%%/checkresults %%ICINGADIR%%/rw
- at exec chown %%ICINGAUSER%%:%%ICINGAGROUP%% %%ICINGADIR%% %%ICINGALOGDIR%%/archives %%ICINGADIR%%/checkresults
- at exec chown %%ICINGAUSER%%:%%WWWGRP%% %%ICINGADIR%%/rw
bin/icinga
bin/icingastats
%%IDOUTILS%%bin/ido2db
%%IDOUTILS%%bin/log2ido
-%%EMBEDDED_PERL%%bin/p1.pl
etc/icinga/cgi.cfg-sample
etc/icinga/cgiauth.cfg-sample
etc/icinga/icinga.cfg-sample
%%IDOUTILS%%etc/icinga/ido2db.cfg-sample
%%IDOUTILS%%etc/icinga/idomod.cfg-sample
%%IDOUTILS%%etc/icinga/modules/idoutils.cfg-sample
-%%IDOUTILS%%etc/icinga/objects/ido2db_check_proc.cfg
etc/icinga/objects/commands.cfg-sample
etc/icinga/objects/contacts.cfg-sample
+%%IDOUTILS%%etc/icinga/objects/ido2db_check_proc.cfg-sample
etc/icinga/objects/localhost.cfg-sample
etc/icinga/objects/notifications.cfg-sample
etc/icinga/objects/printer.cfg-sample
@@ -37,6 +29,7 @@ libexec/icinga/eventhandlers/enable_noti
libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-host-event
libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-proc-event
libexec/icinga/eventhandlers/submit_check_result
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache22/icinga.conf-sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db.cfg-sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db.cfg-sample.in
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db_check_proc.cfg
@@ -46,6 +39,9 @@ libexec/icinga/eventhandlers/submit_chec
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/idoutils.cfg-sample.in
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.7_to_1.8.cfg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.8_to_1.9.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_added_1.9_to_1.10.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/ido2db.cfg_removed_1.9_to_1.10.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/updates/idomod.cfg_added_1.9_to_1.10.cfg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/mysql.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-0.8.3.sql
@@ -55,6 +51,7 @@ libexec/icinga/eventhandlers/submit_chec
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.3.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.0rc.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.10.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.3.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.4.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.5.0.sql
@@ -72,6 +69,7 @@ libexec/icinga/eventhandlers/submit_chec
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.1.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.2-fix-object-relations.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.10.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.3.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.4.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.5.0.sql
@@ -86,6 +84,7 @@ libexec/icinga/eventhandlers/submit_chec
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/pgsql.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.10.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql
@@ -124,8 +123,6 @@ libexec/icinga/eventhandlers/submit_chec
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/servicegroup_membership.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/services.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/state_history.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/timed_event_queue.sql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/timed_events.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/create_mysqldb.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/create_oracledb.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/create_pgsqldb.sh
@@ -173,6 +170,7 @@ libexec/icinga/eventhandlers/submit_chec
%%ICINGAWWWDIR%%/docs/de/ch10.html
%%ICINGAWWWDIR%%/docs/de/ch11.html
%%ICINGAWWWDIR%%/docs/de/ch12.html
+%%ICINGAWWWDIR%%/docs/de/ch13.html
%%ICINGAWWWDIR%%/docs/de/checkscheduling.html
%%ICINGAWWWDIR%%/docs/de/clusters.html
%%ICINGAWWWDIR%%/docs/de/components.html
@@ -253,6 +251,20 @@ libexec/icinga/eventhandlers/submit_chec
%%ICINGAWWWDIR%%/docs/de/recurring_downtimes.html
%%ICINGAWWWDIR%%/docs/de/redundancy.html
%%ICINGAWWWDIR%%/docs/de/reporting.html
+%%ICINGAWWWDIR%%/docs/de/sample-cgi.html
+%%ICINGAWWWDIR%%/docs/de/sample-commands.html
+%%ICINGAWWWDIR%%/docs/de/sample-config.html
+%%ICINGAWWWDIR%%/docs/de/sample-contacts.html
+%%ICINGAWWWDIR%%/docs/de/sample-httpd.html
+%%ICINGAWWWDIR%%/docs/de/sample-icinga.html
+%%ICINGAWWWDIR%%/docs/de/sample-localhost.html
+%%ICINGAWWWDIR%%/docs/de/sample-notifications.html
+%%ICINGAWWWDIR%%/docs/de/sample-printer.html
+%%ICINGAWWWDIR%%/docs/de/sample-resource.html
+%%ICINGAWWWDIR%%/docs/de/sample-switch.html
+%%ICINGAWWWDIR%%/docs/de/sample-templates.html
+%%ICINGAWWWDIR%%/docs/de/sample-timeperiods.html
+%%ICINGAWWWDIR%%/docs/de/sample-windows.html
%%ICINGAWWWDIR%%/docs/de/security.html
%%ICINGAWWWDIR%%/docs/de/servicechecks.html
%%ICINGAWWWDIR%%/docs/de/stalking.html
@@ -292,6 +304,7 @@ libexec/icinga/eventhandlers/submit_chec
%%ICINGAWWWDIR%%/docs/en/ch10.html
%%ICINGAWWWDIR%%/docs/en/ch11.html
%%ICINGAWWWDIR%%/docs/en/ch12.html
+%%ICINGAWWWDIR%%/docs/en/ch13.html
%%ICINGAWWWDIR%%/docs/en/checkscheduling.html
%%ICINGAWWWDIR%%/docs/en/clusters.html
%%ICINGAWWWDIR%%/docs/en/config.html
@@ -372,6 +385,20 @@ libexec/icinga/eventhandlers/submit_chec
%%ICINGAWWWDIR%%/docs/en/recurring_downtimes.html
%%ICINGAWWWDIR%%/docs/en/redundancy.html
%%ICINGAWWWDIR%%/docs/en/reporting.html
+%%ICINGAWWWDIR%%/docs/en/sample-cgi.html
+%%ICINGAWWWDIR%%/docs/en/sample-commands.html
+%%ICINGAWWWDIR%%/docs/en/sample-config.html
+%%ICINGAWWWDIR%%/docs/en/sample-contacts.html
+%%ICINGAWWWDIR%%/docs/en/sample-httpd.html
+%%ICINGAWWWDIR%%/docs/en/sample-icinga.html
+%%ICINGAWWWDIR%%/docs/en/sample-localhost.html
+%%ICINGAWWWDIR%%/docs/en/sample-notifications.html
+%%ICINGAWWWDIR%%/docs/en/sample-printer.html
+%%ICINGAWWWDIR%%/docs/en/sample-resource.html
+%%ICINGAWWWDIR%%/docs/en/sample-switch.html
+%%ICINGAWWWDIR%%/docs/en/sample-templates.html
+%%ICINGAWWWDIR%%/docs/en/sample-timeperiods.html
+%%ICINGAWWWDIR%%/docs/en/sample-windows.html
%%ICINGAWWWDIR%%/docs/en/security.html
%%ICINGAWWWDIR%%/docs/en/servicechecks.html
%%ICINGAWWWDIR%%/docs/en/stalking.html
@@ -509,110 +536,56 @@ libexec/icinga/eventhandlers/submit_chec
%%ICINGAWWWDIR%%/docs/images/icinga-reporting-overview_1.8.png
%%ICINGAWWWDIR%%/docs/images/icinga-reporting_1.6.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups1.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups1_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups1_1.9.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups2.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_groups2_1.6.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_logs1.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_principals.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_tasks.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users1.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users1_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users1_1.9.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users2.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-admin_users2_1.6.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_hst.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_hst_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_hst_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_hst_1.6.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks-settings_1.9.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks-settings.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.7.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.9.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.7.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.9.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.7.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.9.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks4_1.9.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks4.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-exp_1.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-exp_2.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-exp_3.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-exp_4.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-exp_5.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.9.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-filter2.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter2_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter2_1.9.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-filter3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter3_1.9.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter4_1.9.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter5_1.9.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-filter6_1.9.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-filter4.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-filter5.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-filter6.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-host-obj.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-host-obj1.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-host_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-host_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-host_1.8.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-hostgroup_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-hostgroup_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-hostgroup_1.8.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-host.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-hostgroup.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-instance-down.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-log.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-log_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-log_1.6.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-login.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-main_bar.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen1.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen1_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen1_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen1_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen_1.8.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-mainscreen.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-open_problems.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-overview.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.7.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.8.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.9.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-search1.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-settings.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-settings_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.8.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-srv.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-srv_obj.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-statuscronk.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-statuscronk_1.5.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-statuscronk_1.6.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle1.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle2.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle3.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle4.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.6.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2_1.3.png
-%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenuadmin1_1.9.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenuadmin1.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-user-prefs-logout.png
%%ICINGAWWWDIR%%/docs/images/idoutils.png
%%ICINGAWWWDIR%%/docs/images/important.gif
@@ -745,6 +718,7 @@ libexec/icinga/eventhandlers/submit_chec
%%ICINGAWWWDIR%%/images/menu_bar.gif
%%ICINGAWWWDIR%%/images/menu_blank.gif
%%ICINGAWWWDIR%%/images/menu_body.gif
+%%ICINGAWWWDIR%%/images/menu_cat_gray.png
%%ICINGAWWWDIR%%/images/menu_less.gif
%%ICINGAWWWDIR%%/images/menu_li1.gif
%%ICINGAWWWDIR%%/images/menu_li2.gif
@@ -800,21 +774,31 @@ libexec/icinga/eventhandlers/submit_chec
%%ICINGAWWWDIR%%/jquery-ui/themes/base/images/ui-icons_cd0a0a_256x240.png
%%ICINGAWWWDIR%%/jquery-ui/themes/base/jquery.ui.all.css
%%ICINGAWWWDIR%%/jquery-ui/themes/base/jquery.ui.base.css
+%%ICINGAWWWDIR%%/jquery-ui/themes/base/jquery.ui.button.css
%%ICINGAWWWDIR%%/jquery-ui/themes/base/jquery.ui.core.css
%%ICINGAWWWDIR%%/jquery-ui/themes/base/jquery.ui.datepicker.css
%%ICINGAWWWDIR%%/jquery-ui/themes/base/jquery.ui.slider.css
%%ICINGAWWWDIR%%/jquery-ui/themes/base/jquery.ui.theme.css
+%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.autocomplete.js
+%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.button.js
%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.core.js
%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.datepicker.js
+%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.effect-blind.js
+%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.effect.js
+%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.menu.js
%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.mouse.js
+%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.position.js
%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.slider.js
%%ICINGAWWWDIR%%/jquery-ui/ui/jquery.ui.widget.js
+%%ICINGAWWWDIR%%/js/autocomplete.js
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list