From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 18 22:10:10 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D3EA1065674 for ; Sat, 18 Dec 2010 22:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1274E8FC19 for ; Sat, 18 Dec 2010 22:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oBIMA9de064649 for ; Sat, 18 Dec 2010 22:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oBIMA911064648; Sat, 18 Dec 2010 22:10:09 GMT (envelope-from gnats) Resent-Date: Sat, 18 Dec 2010 22:10:09 GMT Resent-Message-Id: <201012182210.oBIMA911064648@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, olli hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5222D1065679; Sat, 18 Dec 2010 22:05:27 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from u18-124.dslaccess.de (unknown [194.231.39.124]) by mx1.freebsd.org (Postfix) with ESMTP id D81C18FC22; Sat, 18 Dec 2010 22:05:24 +0000 (UTC) Received: by u18-124.dslaccess.de (Postfix, from userid 1100) id 7ECD520574; Sat, 18 Dec 2010 23:05:21 +0100 (CET) Message-Id: <20101218220521.7ECD520574@u18-124.dslaccess.de> Date: Sat, 18 Dec 2010 23:05:21 +0100 (CET) From: olli hauer To: X-Send-Pr-Version: 3.113 Cc: rea@FreeBSD.org Subject: ports/153283: [patch] port net-mgmt/pnp update to version 0.6.10 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: olli hauer List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Dec 2010 22:10:10 -0000 >Number: 153283 >Category: ports >Synopsis: [patch] port net-mgmt/pnp update to version 0.6.10 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Dec 18 22:10:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Olli Hauer >Release: >Organization: >Environment: >Description: - update pnp to version 0.6.10 - replace ${PREFIX}etc/pnp with ETCDIR - install sample config for apache - add new variable PNP_URL, adjust pkg-message (I need this variable for another port) - move to new patch format which can be maintained with command 'make makepatch', this makes it easier for everyone to write patches. Both patch files (patch-001/2...) containig patches for the same src file (samples/Makefile.in). Until now there is no big history on the files patch-00x... so it is a good time to change back to a format which can be easy maintained. (Not done for the extra-patch!) - sort pkg-plist so genplist can be used in future (I provide my ~/.genplist/pnp file) Changelog: http://docs.pnp4nagios.org/pnp-0.6/dwnld#changelog * Feature: Add RRDTool Option .only-graph if graph height is below 32px to create thumbnails * Feature: RRDTool Option .width and .height is now allowed in templates * Feature: RRDTool DS Type for UOM of .c. changed from COUNTER to DERIVE * Feature: Pass query string from special controller to image controller ( Matthew Garrett ) * Feature: Authorisation against mk_livestatus API added * Feature: Sample nginx webserver config added ( by evax@users.sourceforge.net ) * Feature: Kohana backport to support PHP 5.1.6 ( Kudos to Andreas Ericsson ) * Bugfix: Sort list of special templates * Bugfix: Urlencode hostname and service description ( Reported by Yannick ) * Bugfix: corrected warning/critical thresholds in ticker/alerter functions >How-To-Repeat: >Fix: --- patch_pnp-0.6.10.txt begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-mgmt/pnp/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 10 Dec 2010 19:21:01 -0000 1.11 +++ Makefile 18 Dec 2010 21:11:39 -0000 @@ -6,7 +6,7 @@ # PORTNAME= pnp -PORTVERSION= 0.6.7 +PORTVERSION= 0.6.10 CATEGORIES= net-mgmt MASTER_SITES= SF MASTER_SITE_SUBDIR=pnp4nagios/PNP-0.6 @@ -28,7 +28,7 @@ LICENSE= GPLv2 PATCH_STRIP= -p1 USE_PERL5= yes -USE_PHP= zlib gd xml pcre filter iconv json simplexml +USE_PHP= filter gd iconv json pcre simplexml xml zlib WANT_PHP_WEB= yes USE_RC_SUBR= npcd.sh MAN8= npcd.8 @@ -42,6 +42,7 @@ PNP_STATE= ${NAGIOSDIR}/pnp PNP_RRDS= ${PNP_STATE}/rrd PNP_SPOOL= ${PNP_STATE}/perfspool +PNP_URL= /pnp FPDF_DIR?= share/fpdf SPOOL_DIRS= ${PNP_STATE}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_RRDS}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_SPOOL}:${NAGIOSUSER}:${NAGIOSGROUP}:0750 @@ -51,7 +52,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= \ - --sysconfdir=${PREFIX}/etc/pnp \ + --sysconfdir=${ETCDIR} \ --datarootdir=${WWWDIR} \ --datadir=${WWWDIR} \ --localstatedir=/var/log \ @@ -59,18 +60,22 @@ --with-perfdata-dir=${PNP_RRDS} \ --with-perfdata-spool-dir=${PNP_SPOOL} \ --with-nagios-user=${NAGIOSUSER} \ - --with-nagios-group=${NAGIOSGROUP} + --with-nagios-group=${NAGIOSGROUP} \ + --with-base-url=${PNP_URL} \ + --with-httpd-conf=${ETCDIR} + # Get rid of INSTALL_OPTS that are set by configure -- # we want the things to be installed with root:wheel and # NAGIOSUSER:NAGIOSGROUP are going to the configuration files. MAKE_ARGS= INSTALL_OPTS= -INSTALL_TARGET= install install-config +INSTALL_TARGET= install install-config install-webconf SUB_FILES= pkg-install \ pkg-deinstall \ pkg-message SUB_LIST= SPOOL_DIRS=${SPOOL_DIRS} \ PNP_RRDS=${PNP_RRDS} \ + PNP_URL=${PNP_URL} \ NAGIOSUSER=${NAGIOSUSER} \ NAGIOSGROUP=${NAGIOSGROUP} @@ -79,18 +84,20 @@ .else PNP_USE_FPDF= 0 .endif + post-patch: - @${REINPLACE_CMD} \ - -e's|^\$$conf\['\''use_fpdf'\''\] = [[:digit:]];|$$conf['\''use_fpdf'\''] = ${PNP_USE_FPDF};|' \ - -e's|^\$$conf\['\''nagios_base'\''\] = "/nagios/cgi-bin";|$$conf\['\''nagios_base'\''\] = "${NAGIOSHTMURL}/cgi-bin";|' \ - "${WRKSRC}/sample-config/pnp/config.php.in" + @${REINPLACE_CMD} -E \ + -e's|^\$$conf\['\''use_fpdf'\''\] = [[:digit:]];|$$conf['\''use_fpdf'\''] = ${PNP_USE_FPDF};|' \ + -e's|^\$$conf\['\''nagios_base'\''\] = "/nagios/cgi-bin";|$$conf\['\''nagios_base'\''\] = "${NAGIOSHTMURL}/cgi-bin";|' \ + -e 's|(/usr/local/)(check_mk)|\1share/\2|' -e 's|/usr/local/nagios/var/(rw/live)|${NAGIOSDIR}/\1|' \ + "${WRKSRC}/sample-config/pnp/config.php.in" pre-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: .for m in ${MAN8} - ${INSTALL_MAN} ${WRKSRC}/man/${m} ${MAN1PREFIX}/man/man8/${m} + ${INSTALL_MAN} ${WRKSRC}/man/${m} ${MAN8PREFIX}/man/man8/${m} .endfor @${CAT} ${PKGMESSAGE} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/net-mgmt/pnp/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 23 Nov 2010 22:10:20 -0000 1.4 +++ distinfo 18 Dec 2010 21:11:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (pnp4nagios-0.6.7.tar.gz) = 010128d1ed13afed1cc313264b10807b60b7dc596d0e9e86c0ac7208d0df5878 -SIZE (pnp4nagios-0.6.7.tar.gz) = 1874012 +SHA256 (pnp4nagios-0.6.10.tar.gz) = c99180dd2a36d799f48a73a9ac63d8877e0e1f36a0847a9ce7103bf2a4e86bc8 +SIZE (pnp4nagios-0.6.10.tar.gz) = 1950868 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-mgmt/pnp/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 23 Nov 2010 22:10:20 -0000 1.4 +++ pkg-plist 18 Dec 2010 21:11:39 -0000 @@ -1,335 +1,280 @@ bin/npcd -etc/pnp/check_commands/check_nwstat.cfg-sample -etc/pnp/check_commands/check_nrpe.cfg-sample -etc/pnp/check_commands/check_all_local_disks.cfg-sample -etc/pnp/pages/web_traffic.cfg-sample -etc/pnp/pnp4nagios_release -etc/pnp/config.php-sample -etc/pnp/background.pdf-sample -etc/pnp/process_perfdata.cfg-sample -etc/pnp/rra.cfg-sample -etc/pnp/misccommands.cfg-sample -etc/pnp/nagios.cfg-sample -etc/pnp/npcd.cfg-sample -lib/npcdmod.o +%%ETCDIR%%/background.pdf-sample +%%ETCDIR%%/check_commands/check_all_local_disks.cfg-sample +%%ETCDIR%%/check_commands/check_nrpe.cfg-sample +%%ETCDIR%%/check_commands/check_nwstat.cfg-sample +%%ETCDIR%%/config.php-sample +%%ETCDIR%%/misccommands.cfg-sample +%%ETCDIR%%/nagios.cfg-sample +%%ETCDIR%%/npcd.cfg-sample +%%ETCDIR%%/pages/web_traffic.cfg-sample +%%ETCDIR%%/pnp4nagios-apache.conf-sample +%%ETCDIR%%/pnp4nagios_release +%%ETCDIR%%/process_perfdata.cfg-sample +%%ETCDIR%%/rra.cfg-sample +lib/kohana/system/config/cache.php +lib/kohana/system/config/cache_memcache.php +lib/kohana/system/config/cache_sqlite.php +lib/kohana/system/config/cache_xcache.php +lib/kohana/system/config/captcha.php +lib/kohana/system/config/cookie.php +lib/kohana/system/config/credit_cards.php +lib/kohana/system/config/database.php +lib/kohana/system/config/email.php +lib/kohana/system/config/encryption.php +lib/kohana/system/config/http.php +lib/kohana/system/config/image.php +lib/kohana/system/config/inflector.php +lib/kohana/system/config/locale.php +lib/kohana/system/config/mimes.php +lib/kohana/system/config/pagination.php +lib/kohana/system/config/profiler.php +lib/kohana/system/config/routes.php +lib/kohana/system/config/session.php +lib/kohana/system/config/sql_types.php +lib/kohana/system/config/upload.php +lib/kohana/system/config/user_agents.php +lib/kohana/system/config/view.php lib/kohana/system/controllers/captcha.php lib/kohana/system/controllers/template.php -lib/kohana/system/i18n/de_DE/validation.php -lib/kohana/system/i18n/de_DE/core.php -lib/kohana/system/i18n/de_DE/pagination.php +lib/kohana/system/core/Benchmark.php +lib/kohana/system/core/Bootstrap.php +lib/kohana/system/core/Event.php +lib/kohana/system/core/Kohana.php +lib/kohana/system/core/utf8.php +lib/kohana/system/core/utf8/from_unicode.php +lib/kohana/system/core/utf8/ltrim.php +lib/kohana/system/core/utf8/ord.php +lib/kohana/system/core/utf8/rtrim.php +lib/kohana/system/core/utf8/str_ireplace.php +lib/kohana/system/core/utf8/str_pad.php +lib/kohana/system/core/utf8/str_split.php +lib/kohana/system/core/utf8/strcasecmp.php +lib/kohana/system/core/utf8/strcspn.php +lib/kohana/system/core/utf8/stristr.php +lib/kohana/system/core/utf8/strlen.php +lib/kohana/system/core/utf8/strpos.php +lib/kohana/system/core/utf8/strrev.php +lib/kohana/system/core/utf8/strrpos.php +lib/kohana/system/core/utf8/strspn.php +lib/kohana/system/core/utf8/strtolower.php +lib/kohana/system/core/utf8/strtoupper.php +lib/kohana/system/core/utf8/substr.php +lib/kohana/system/core/utf8/substr_replace.php +lib/kohana/system/core/utf8/to_unicode.php +lib/kohana/system/core/utf8/transliterate_to_ascii.php +lib/kohana/system/core/utf8/trim.php +lib/kohana/system/core/utf8/ucfirst.php +lib/kohana/system/core/utf8/ucwords.php +lib/kohana/system/fonts/DejaVuSerif.ttf +lib/kohana/system/fonts/LICENSE +lib/kohana/system/helpers/arr.php +lib/kohana/system/helpers/cookie.php +lib/kohana/system/helpers/date.php +lib/kohana/system/helpers/download.php +lib/kohana/system/helpers/email.php +lib/kohana/system/helpers/expires.php +lib/kohana/system/helpers/feed.php +lib/kohana/system/helpers/file.php +lib/kohana/system/helpers/form.php +lib/kohana/system/helpers/format.php +lib/kohana/system/helpers/html.php +lib/kohana/system/helpers/inflector.php +lib/kohana/system/helpers/num.php +lib/kohana/system/helpers/remote.php +lib/kohana/system/helpers/request.php +lib/kohana/system/helpers/security.php +lib/kohana/system/helpers/text.php +lib/kohana/system/helpers/upload.php +lib/kohana/system/helpers/url.php +lib/kohana/system/helpers/valid.php +lib/kohana/system/i18n/de_DE/cache.php +lib/kohana/system/i18n/de_DE/calendar.php lib/kohana/system/i18n/de_DE/captcha.php +lib/kohana/system/i18n/de_DE/core.php +lib/kohana/system/i18n/de_DE/database.php lib/kohana/system/i18n/de_DE/encrypt.php -lib/kohana/system/i18n/de_DE/orm.php +lib/kohana/system/i18n/de_DE/errors.php +lib/kohana/system/i18n/de_DE/event.php lib/kohana/system/i18n/de_DE/image.php -lib/kohana/system/i18n/de_DE/session.php -lib/kohana/system/i18n/de_DE/database.php -lib/kohana/system/i18n/de_DE/calendar.php +lib/kohana/system/i18n/de_DE/orm.php +lib/kohana/system/i18n/de_DE/pagination.php lib/kohana/system/i18n/de_DE/profiler.php -lib/kohana/system/i18n/de_DE/cache.php -lib/kohana/system/i18n/de_DE/upload.php -lib/kohana/system/i18n/de_DE/event.php -lib/kohana/system/i18n/de_DE/errors.php +lib/kohana/system/i18n/de_DE/session.php lib/kohana/system/i18n/de_DE/swift.php -lib/kohana/system/i18n/nl_NL/validation.php -lib/kohana/system/i18n/nl_NL/core.php -lib/kohana/system/i18n/nl_NL/pagination.php -lib/kohana/system/i18n/nl_NL/captcha.php -lib/kohana/system/i18n/nl_NL/encrypt.php -lib/kohana/system/i18n/nl_NL/orm.php -lib/kohana/system/i18n/nl_NL/image.php -lib/kohana/system/i18n/nl_NL/session.php -lib/kohana/system/i18n/nl_NL/database.php -lib/kohana/system/i18n/nl_NL/calendar.php -lib/kohana/system/i18n/nl_NL/profiler.php -lib/kohana/system/i18n/nl_NL/cache.php -lib/kohana/system/i18n/nl_NL/upload.php -lib/kohana/system/i18n/nl_NL/event.php -lib/kohana/system/i18n/nl_NL/errors.php -lib/kohana/system/i18n/nl_NL/swift.php -lib/kohana/system/i18n/es_ES/validation.php -lib/kohana/system/i18n/es_ES/core.php -lib/kohana/system/i18n/es_ES/pagination.php -lib/kohana/system/i18n/es_ES/captcha.php -lib/kohana/system/i18n/es_ES/encrypt.php -lib/kohana/system/i18n/es_ES/orm.php -lib/kohana/system/i18n/es_ES/image.php -lib/kohana/system/i18n/es_ES/session.php -lib/kohana/system/i18n/es_ES/database.php -lib/kohana/system/i18n/es_ES/calendar.php -lib/kohana/system/i18n/es_ES/profiler.php -lib/kohana/system/i18n/es_ES/cache.php -lib/kohana/system/i18n/es_ES/upload.php -lib/kohana/system/i18n/es_ES/event.php -lib/kohana/system/i18n/es_ES/errors.php -lib/kohana/system/i18n/es_ES/swift.php -lib/kohana/system/i18n/ru_RU/validation.php -lib/kohana/system/i18n/ru_RU/core.php -lib/kohana/system/i18n/ru_RU/pagination.php -lib/kohana/system/i18n/ru_RU/captcha.php -lib/kohana/system/i18n/ru_RU/encrypt.php -lib/kohana/system/i18n/ru_RU/orm.php -lib/kohana/system/i18n/ru_RU/image.php -lib/kohana/system/i18n/ru_RU/session.php -lib/kohana/system/i18n/ru_RU/database.php -lib/kohana/system/i18n/ru_RU/calendar.php -lib/kohana/system/i18n/ru_RU/profiler.php -lib/kohana/system/i18n/ru_RU/cache.php -lib/kohana/system/i18n/ru_RU/upload.php -lib/kohana/system/i18n/ru_RU/event.php -lib/kohana/system/i18n/ru_RU/errors.php -lib/kohana/system/i18n/ru_RU/swift.php -lib/kohana/system/i18n/en_US/validation.php -lib/kohana/system/i18n/en_US/core.php -lib/kohana/system/i18n/en_US/pagination.php +lib/kohana/system/i18n/de_DE/upload.php +lib/kohana/system/i18n/de_DE/validation.php +lib/kohana/system/i18n/en_US/cache.php +lib/kohana/system/i18n/en_US/calendar.php lib/kohana/system/i18n/en_US/captcha.php +lib/kohana/system/i18n/en_US/core.php +lib/kohana/system/i18n/en_US/database.php lib/kohana/system/i18n/en_US/encrypt.php -lib/kohana/system/i18n/en_US/orm.php +lib/kohana/system/i18n/en_US/errors.php +lib/kohana/system/i18n/en_US/event.php lib/kohana/system/i18n/en_US/image.php -lib/kohana/system/i18n/en_US/session.php -lib/kohana/system/i18n/en_US/database.php -lib/kohana/system/i18n/en_US/calendar.php +lib/kohana/system/i18n/en_US/orm.php +lib/kohana/system/i18n/en_US/pagination.php lib/kohana/system/i18n/en_US/profiler.php -lib/kohana/system/i18n/en_US/cache.php -lib/kohana/system/i18n/en_US/upload.php -lib/kohana/system/i18n/en_US/event.php -lib/kohana/system/i18n/en_US/errors.php +lib/kohana/system/i18n/en_US/session.php lib/kohana/system/i18n/en_US/swift.php -lib/kohana/system/i18n/fr_FR/validation.php -lib/kohana/system/i18n/fr_FR/core.php -lib/kohana/system/i18n/fr_FR/pagination.php +lib/kohana/system/i18n/en_US/upload.php +lib/kohana/system/i18n/en_US/validation.php +lib/kohana/system/i18n/es_ES/cache.php +lib/kohana/system/i18n/es_ES/calendar.php +lib/kohana/system/i18n/es_ES/captcha.php +lib/kohana/system/i18n/es_ES/core.php +lib/kohana/system/i18n/es_ES/database.php +lib/kohana/system/i18n/es_ES/encrypt.php +lib/kohana/system/i18n/es_ES/errors.php +lib/kohana/system/i18n/es_ES/event.php +lib/kohana/system/i18n/es_ES/image.php +lib/kohana/system/i18n/es_ES/orm.php +lib/kohana/system/i18n/es_ES/pagination.php +lib/kohana/system/i18n/es_ES/profiler.php +lib/kohana/system/i18n/es_ES/session.php +lib/kohana/system/i18n/es_ES/swift.php +lib/kohana/system/i18n/es_ES/upload.php +lib/kohana/system/i18n/es_ES/validation.php +lib/kohana/system/i18n/fr_FR/cache.php +lib/kohana/system/i18n/fr_FR/calendar.php lib/kohana/system/i18n/fr_FR/captcha.php +lib/kohana/system/i18n/fr_FR/core.php +lib/kohana/system/i18n/fr_FR/database.php lib/kohana/system/i18n/fr_FR/encrypt.php -lib/kohana/system/i18n/fr_FR/orm.php +lib/kohana/system/i18n/fr_FR/errors.php +lib/kohana/system/i18n/fr_FR/event.php lib/kohana/system/i18n/fr_FR/image.php -lib/kohana/system/i18n/fr_FR/session.php -lib/kohana/system/i18n/fr_FR/database.php -lib/kohana/system/i18n/fr_FR/calendar.php +lib/kohana/system/i18n/fr_FR/orm.php +lib/kohana/system/i18n/fr_FR/pagination.php lib/kohana/system/i18n/fr_FR/profiler.php -lib/kohana/system/i18n/fr_FR/cache.php -lib/kohana/system/i18n/fr_FR/upload.php -lib/kohana/system/i18n/fr_FR/event.php -lib/kohana/system/i18n/fr_FR/errors.php +lib/kohana/system/i18n/fr_FR/session.php lib/kohana/system/i18n/fr_FR/swift.php -lib/kohana/system/i18n/it_IT/validation.php -lib/kohana/system/i18n/it_IT/core.php -lib/kohana/system/i18n/it_IT/pagination.php +lib/kohana/system/i18n/fr_FR/upload.php +lib/kohana/system/i18n/fr_FR/validation.php +lib/kohana/system/i18n/it_IT/cache.php +lib/kohana/system/i18n/it_IT/calendar.php lib/kohana/system/i18n/it_IT/captcha.php +lib/kohana/system/i18n/it_IT/core.php +lib/kohana/system/i18n/it_IT/database.php lib/kohana/system/i18n/it_IT/encrypt.php -lib/kohana/system/i18n/it_IT/orm.php +lib/kohana/system/i18n/it_IT/errors.php +lib/kohana/system/i18n/it_IT/event.php lib/kohana/system/i18n/it_IT/image.php -lib/kohana/system/i18n/it_IT/session.php -lib/kohana/system/i18n/it_IT/database.php -lib/kohana/system/i18n/it_IT/calendar.php +lib/kohana/system/i18n/it_IT/orm.php +lib/kohana/system/i18n/it_IT/pagination.php lib/kohana/system/i18n/it_IT/profiler.php -lib/kohana/system/i18n/it_IT/cache.php -lib/kohana/system/i18n/it_IT/upload.php -lib/kohana/system/i18n/it_IT/event.php -lib/kohana/system/i18n/it_IT/errors.php +lib/kohana/system/i18n/it_IT/session.php lib/kohana/system/i18n/it_IT/swift.php -lib/kohana/system/helpers/remote.php -lib/kohana/system/helpers/url.php -lib/kohana/system/helpers/feed.php -lib/kohana/system/helpers/expires.php -lib/kohana/system/helpers/text.php -lib/kohana/system/helpers/email.php -lib/kohana/system/helpers/download.php -lib/kohana/system/helpers/format.php -lib/kohana/system/helpers/form.php -lib/kohana/system/helpers/arr.php -lib/kohana/system/helpers/html.php -lib/kohana/system/helpers/valid.php -lib/kohana/system/helpers/date.php -lib/kohana/system/helpers/file.php -lib/kohana/system/helpers/request.php -lib/kohana/system/helpers/upload.php -lib/kohana/system/helpers/cookie.php -lib/kohana/system/helpers/security.php -lib/kohana/system/helpers/num.php -lib/kohana/system/helpers/inflector.php -lib/kohana/system/libraries/drivers/Database/Mssql.php -lib/kohana/system/libraries/drivers/Database/Pdosqlite.php -lib/kohana/system/libraries/drivers/Database/Mysqli.php -lib/kohana/system/libraries/drivers/Database/Pgsql.php -lib/kohana/system/libraries/drivers/Database/Mysql.php -lib/kohana/system/libraries/drivers/Captcha/Alpha.php -lib/kohana/system/libraries/drivers/Captcha/Math.php -lib/kohana/system/libraries/drivers/Captcha/Word.php -lib/kohana/system/libraries/drivers/Captcha/Riddle.php -lib/kohana/system/libraries/drivers/Captcha/Basic.php -lib/kohana/system/libraries/drivers/Captcha/Black.php -lib/kohana/system/libraries/drivers/Cache/Eaccelerator.php -lib/kohana/system/libraries/drivers/Cache/Apc.php -lib/kohana/system/libraries/drivers/Cache/Memcache.php -lib/kohana/system/libraries/drivers/Cache/Xcache.php -lib/kohana/system/libraries/drivers/Cache/File.php -lib/kohana/system/libraries/drivers/Cache/Sqlite.php -lib/kohana/system/libraries/drivers/Image/GraphicsMagick.php -lib/kohana/system/libraries/drivers/Image/GD.php -lib/kohana/system/libraries/drivers/Image/ImageMagick.php -lib/kohana/system/libraries/drivers/Session/Cookie.php -lib/kohana/system/libraries/drivers/Session/Cache.php -lib/kohana/system/libraries/drivers/Session/Database.php -lib/kohana/system/libraries/drivers/Captcha.php -lib/kohana/system/libraries/drivers/Cache.php -lib/kohana/system/libraries/drivers/Session.php -lib/kohana/system/libraries/drivers/Image.php -lib/kohana/system/libraries/drivers/Database.php -lib/kohana/system/libraries/Pagination.php -lib/kohana/system/libraries/ORM_Tree.php -lib/kohana/system/libraries/Encrypt.php +lib/kohana/system/i18n/it_IT/upload.php +lib/kohana/system/i18n/it_IT/validation.php +lib/kohana/system/i18n/nl_NL/cache.php +lib/kohana/system/i18n/nl_NL/calendar.php +lib/kohana/system/i18n/nl_NL/captcha.php +lib/kohana/system/i18n/nl_NL/core.php +lib/kohana/system/i18n/nl_NL/database.php +lib/kohana/system/i18n/nl_NL/encrypt.php +lib/kohana/system/i18n/nl_NL/errors.php +lib/kohana/system/i18n/nl_NL/event.php +lib/kohana/system/i18n/nl_NL/image.php +lib/kohana/system/i18n/nl_NL/orm.php +lib/kohana/system/i18n/nl_NL/pagination.php +lib/kohana/system/i18n/nl_NL/profiler.php +lib/kohana/system/i18n/nl_NL/session.php +lib/kohana/system/i18n/nl_NL/swift.php +lib/kohana/system/i18n/nl_NL/upload.php +lib/kohana/system/i18n/nl_NL/validation.php +lib/kohana/system/i18n/ru_RU/cache.php +lib/kohana/system/i18n/ru_RU/calendar.php +lib/kohana/system/i18n/ru_RU/captcha.php +lib/kohana/system/i18n/ru_RU/core.php +lib/kohana/system/i18n/ru_RU/database.php +lib/kohana/system/i18n/ru_RU/encrypt.php +lib/kohana/system/i18n/ru_RU/errors.php +lib/kohana/system/i18n/ru_RU/event.php +lib/kohana/system/i18n/ru_RU/image.php +lib/kohana/system/i18n/ru_RU/orm.php +lib/kohana/system/i18n/ru_RU/pagination.php +lib/kohana/system/i18n/ru_RU/profiler.php +lib/kohana/system/i18n/ru_RU/session.php +lib/kohana/system/i18n/ru_RU/swift.php +lib/kohana/system/i18n/ru_RU/upload.php +lib/kohana/system/i18n/ru_RU/validation.php +lib/kohana/system/libraries/Cache.php lib/kohana/system/libraries/Calendar.php +lib/kohana/system/libraries/Calendar_Event.php +lib/kohana/system/libraries/Captcha.php +lib/kohana/system/libraries/Controller.php +lib/kohana/system/libraries/Database.php lib/kohana/system/libraries/Database_Expression.php +lib/kohana/system/libraries/Encrypt.php lib/kohana/system/libraries/Event_Observer.php lib/kohana/system/libraries/Event_Subject.php -lib/kohana/system/libraries/Captcha.php -lib/kohana/system/libraries/Cache.php -lib/kohana/system/libraries/Session.php lib/kohana/system/libraries/Image.php -lib/kohana/system/libraries/Validation.php -lib/kohana/system/libraries/ORM_Versioned.php -lib/kohana/system/libraries/Controller.php -lib/kohana/system/libraries/Profiler.php +lib/kohana/system/libraries/Input.php lib/kohana/system/libraries/Model.php -lib/kohana/system/libraries/View.php -lib/kohana/system/libraries/Router.php -lib/kohana/system/libraries/ORM_Iterator.php -lib/kohana/system/libraries/URI.php -lib/kohana/system/libraries/Profiler_Table.php lib/kohana/system/libraries/ORM.php -lib/kohana/system/libraries/Calendar_Event.php -lib/kohana/system/libraries/Tagcloud.php -lib/kohana/system/libraries/Input.php -lib/kohana/system/libraries/Database.php -lib/kohana/system/config/locale.php -lib/kohana/system/config/routes.php -lib/kohana/system/config/pagination.php -lib/kohana/system/config/sql_types.php -lib/kohana/system/config/captcha.php -lib/kohana/system/config/email.php -lib/kohana/system/config/image.php -lib/kohana/system/config/cache_sqlite.php -lib/kohana/system/config/cache_memcache.php -lib/kohana/system/config/session.php -lib/kohana/system/config/database.php -lib/kohana/system/config/credit_cards.php -lib/kohana/system/config/http.php -lib/kohana/system/config/mimes.php -lib/kohana/system/config/profiler.php -lib/kohana/system/config/view.php -lib/kohana/system/config/cache.php -lib/kohana/system/config/encryption.php -lib/kohana/system/config/upload.php -lib/kohana/system/config/cookie.php -lib/kohana/system/config/user_agents.php -lib/kohana/system/config/inflector.php -lib/kohana/system/config/cache_xcache.php -lib/kohana/system/core/utf8/transliterate_to_ascii.php -lib/kohana/system/core/utf8/ucfirst.php -lib/kohana/system/core/utf8/ord.php -lib/kohana/system/core/utf8/strrpos.php -lib/kohana/system/core/utf8/strtolower.php -lib/kohana/system/core/utf8/substr.php -lib/kohana/system/core/utf8/str_pad.php -lib/kohana/system/core/utf8/strcspn.php -lib/kohana/system/core/utf8/trim.php -lib/kohana/system/core/utf8/rtrim.php -lib/kohana/system/core/utf8/strcasecmp.php -lib/kohana/system/core/utf8/strtoupper.php -lib/kohana/system/core/utf8/str_split.php -lib/kohana/system/core/utf8/strpos.php -lib/kohana/system/core/utf8/stristr.php -lib/kohana/system/core/utf8/ucwords.php -lib/kohana/system/core/utf8/str_ireplace.php -lib/kohana/system/core/utf8/strlen.php -lib/kohana/system/core/utf8/to_unicode.php -lib/kohana/system/core/utf8/substr_replace.php -lib/kohana/system/core/utf8/from_unicode.php -lib/kohana/system/core/utf8/strrev.php -lib/kohana/system/core/utf8/strspn.php -lib/kohana/system/core/utf8/ltrim.php -lib/kohana/system/core/Event.php -lib/kohana/system/core/Benchmark.php -lib/kohana/system/core/Bootstrap.php -lib/kohana/system/core/Kohana.php -lib/kohana/system/core/utf8.php -lib/kohana/system/views/kohana/template.php -lib/kohana/system/views/pagination/digg.php -lib/kohana/system/views/pagination/punbb.php -lib/kohana/system/views/pagination/extended.php -lib/kohana/system/views/pagination/classic.php -lib/kohana/system/views/kohana_profiler_table.php -lib/kohana/system/views/kohana_error_page.php -lib/kohana/system/views/kohana_calendar.php -lib/kohana/system/views/kohana_profiler_table.css -lib/kohana/system/views/kohana_profiler.php -lib/kohana/system/views/kohana_error_disabled.php -lib/kohana/system/views/kohana_errors.css -lib/kohana/system/fonts/LICENSE -lib/kohana/system/fonts/DejaVuSerif.ttf -libexec/process_perfdata.pl -libexec/check_pnp_rrds.pl -libexec/verify_pnp_config.pl -libexec/rrd_convert.pl -%%WWWDIR%%/documents/_media/bulk-npcd.png -%%WWWDIR%%/documents/_media/bulk-npcdmod.png -%%WWWDIR%%/documents/_media/bulk.png -%%WWWDIR%%/documents/_media/nagiospowered-72x72.png -%%WWWDIR%%/documents/_media/pnp-preview-05-08-2009.png -%%WWWDIR%%/documents/_media/popup.png -%%WWWDIR%%/documents/_media/srv_info.png -%%WWWDIR%%/documents/_media/synchronous.png -%%WWWDIR%%/documents/en_US/about.html -%%WWWDIR%%/documents/en_US/advanced.html -%%WWWDIR%%/documents/en_US/config.html -%%WWWDIR%%/documents/en_US/doc_complete.html -%%WWWDIR%%/documents/en_US/dwnld.html -%%WWWDIR%%/documents/en_US/install.html -%%WWWDIR%%/documents/en_US/modes.html -%%WWWDIR%%/documents/en_US/new-features.html -%%WWWDIR%%/documents/en_US/npcd.html -%%WWWDIR%%/documents/en_US/pages.html -%%WWWDIR%%/documents/en_US/perfdata_format.html -%%WWWDIR%%/documents/en_US/rrd_convert.html -%%WWWDIR%%/documents/en_US/rrdcached.html -%%WWWDIR%%/documents/en_US/start.html -%%WWWDIR%%/documents/en_US/timeranges.html -%%WWWDIR%%/documents/en_US/tpl.html -%%WWWDIR%%/documents/en_US/tpl_custom.html -%%WWWDIR%%/documents/en_US/tpl_helper.html -%%WWWDIR%%/documents/en_US/tpl_special.html -%%WWWDIR%%/documents/en_US/upgrade.html -%%WWWDIR%%/documents/en_US/verify.html -%%WWWDIR%%/documents/en_US/verify_pnp_config.html -%%WWWDIR%%/documents/en_US/webfe.html -%%WWWDIR%%/documents/en_US/webfe_cfg.html -%%WWWDIR%%/documents/en_US/wrapper.html -%%WWWDIR%%/documents/en_US/xport.html -%%WWWDIR%%/documents/de_DE/about.html -%%WWWDIR%%/documents/de_DE/advanced.html -%%WWWDIR%%/documents/de_DE/config.html -%%WWWDIR%%/documents/de_DE/doc_complete.html -%%WWWDIR%%/documents/de_DE/dwnld.html -%%WWWDIR%%/documents/de_DE/install.html -%%WWWDIR%%/documents/de_DE/modes.html -%%WWWDIR%%/documents/de_DE/new-features.html -%%WWWDIR%%/documents/de_DE/npcd.html -%%WWWDIR%%/documents/de_DE/pages.html -%%WWWDIR%%/documents/de_DE/perfdata_format.html -%%WWWDIR%%/documents/de_DE/rrd_convert.html -%%WWWDIR%%/documents/de_DE/rrdcached.html -%%WWWDIR%%/documents/de_DE/start.html -%%WWWDIR%%/documents/de_DE/timeranges.html -%%WWWDIR%%/documents/de_DE/tpl.html -%%WWWDIR%%/documents/de_DE/tpl_custom.html -%%WWWDIR%%/documents/de_DE/tpl_helper.html -%%WWWDIR%%/documents/de_DE/tpl_special.html -%%WWWDIR%%/documents/de_DE/upgrade.html -%%WWWDIR%%/documents/de_DE/verify.html -%%WWWDIR%%/documents/de_DE/verify_pnp_config.html -%%WWWDIR%%/documents/de_DE/webfe.html -%%WWWDIR%%/documents/de_DE/webfe_cfg.html -%%WWWDIR%%/documents/de_DE/wrapper.html -%%WWWDIR%%/documents/de_DE/xport.html +lib/kohana/system/libraries/ORM_Iterator.php +lib/kohana/system/libraries/ORM_Tree.php +lib/kohana/system/libraries/ORM_Versioned.php +lib/kohana/system/libraries/Pagination.php +lib/kohana/system/libraries/Profiler.php +lib/kohana/system/libraries/Profiler_Table.php +lib/kohana/system/libraries/Router.php +lib/kohana/system/libraries/Session.php +lib/kohana/system/libraries/Tagcloud.php +lib/kohana/system/libraries/URI.php +lib/kohana/system/libraries/Validation.php +lib/kohana/system/libraries/View.php +lib/kohana/system/libraries/drivers/Cache.php +lib/kohana/system/libraries/drivers/Cache/Apc.php +lib/kohana/system/libraries/drivers/Cache/Eaccelerator.php +lib/kohana/system/libraries/drivers/Cache/File.php +lib/kohana/system/libraries/drivers/Cache/Memcache.php +lib/kohana/system/libraries/drivers/Cache/Sqlite.php +lib/kohana/system/libraries/drivers/Cache/Xcache.php +lib/kohana/system/libraries/drivers/Captcha.php +lib/kohana/system/libraries/drivers/Captcha/Alpha.php +lib/kohana/system/libraries/drivers/Captcha/Basic.php +lib/kohana/system/libraries/drivers/Captcha/Black.php +lib/kohana/system/libraries/drivers/Captcha/Math.php +lib/kohana/system/libraries/drivers/Captcha/Riddle.php +lib/kohana/system/libraries/drivers/Captcha/Word.php +lib/kohana/system/libraries/drivers/Database.php +lib/kohana/system/libraries/drivers/Database/Mssql.php +lib/kohana/system/libraries/drivers/Database/Mysql.php +lib/kohana/system/libraries/drivers/Database/Mysqli.php +lib/kohana/system/libraries/drivers/Database/Pdosqlite.php +lib/kohana/system/libraries/drivers/Database/Pgsql.php +lib/kohana/system/libraries/drivers/Image.php +lib/kohana/system/libraries/drivers/Image/GD.php +lib/kohana/system/libraries/drivers/Image/GraphicsMagick.php +lib/kohana/system/libraries/drivers/Image/ImageMagick.php +lib/kohana/system/libraries/drivers/Session.php +lib/kohana/system/libraries/drivers/Session/Cache.php +lib/kohana/system/libraries/drivers/Session/Cookie.php +lib/kohana/system/libraries/drivers/Session/Database.php +lib/kohana/system/views/kohana/template.php +lib/kohana/system/views/kohana_calendar.php +lib/kohana/system/views/kohana_error_disabled.php +lib/kohana/system/views/kohana_error_page.php +lib/kohana/system/views/kohana_errors.css +lib/kohana/system/views/kohana_profiler.php +lib/kohana/system/views/kohana_profiler_table.css +lib/kohana/system/views/kohana_profiler_table.php +lib/kohana/system/views/pagination/classic.php +lib/kohana/system/views/pagination/digg.php +lib/kohana/system/views/pagination/extended.php +lib/kohana/system/views/pagination/punbb.php +lib/npcdmod.o +libexec/check_pnp_rrds.pl +libexec/process_perfdata.pl +libexec/rrd_convert.pl +libexec/verify_pnp_config.pl +%%WWWDIR%%/application/config/config.php +%%WWWDIR%%/application/config/locale.php +%%WWWDIR%%/application/config/routes.php +%%WWWDIR%%/application/config/session.php %%WWWDIR%%/application/controllers/ajax.php %%WWWDIR%%/application/controllers/debug.php %%WWWDIR%%/application/controllers/docs.php @@ -345,10 +290,6 @@ %%WWWDIR%%/application/controllers/xml.php %%WWWDIR%%/application/controllers/xport.php %%WWWDIR%%/application/controllers/zoom.php -%%WWWDIR%%/application/config/config.php -%%WWWDIR%%/application/config/locale.php -%%WWWDIR%%/application/config/routes.php -%%WWWDIR%%/application/config/session.php %%WWWDIR%%/application/helpers/nagios.php %%WWWDIR%%/application/helpers/pnp.php %%WWWDIR%%/application/helpers/rrd.php @@ -358,13 +299,40 @@ %%WWWDIR%%/application/i18n/en_US/error.php %%WWWDIR%%/application/i18n/es_ES/common.php %%WWWDIR%%/application/i18n/es_ES/error.php -%%WWWDIR%%/application/i18n/ru_RU/common.php -%%WWWDIR%%/application/i18n/ru_RU/error.php %%WWWDIR%%/application/i18n/fr_FR/common.php %%WWWDIR%%/application/i18n/fr_FR/error.php +%%WWWDIR%%/application/i18n/ru_RU/common.php +%%WWWDIR%%/application/i18n/ru_RU/error.php +%%WWWDIR%%/application/lib/json.php +%%WWWDIR%%/application/lib/jsonwrapper.php +%%WWWDIR%%/application/lib/jsonwrapper_inner.php +%%WWWDIR%%/application/models/auth.php %%WWWDIR%%/application/models/config.php %%WWWDIR%%/application/models/data.php %%WWWDIR%%/application/models/rrdtool.php +%%WWWDIR%%/application/models/system.php +%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85.php +%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85_FPDI.php +%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW.php +%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW_FPDI.php +%%WWWDIR%%/application/vendor/fpdf/font/courier.php +%%WWWDIR%%/application/vendor/fpdf/font/helvetica.php +%%WWWDIR%%/application/vendor/fpdf/font/helveticab.php +%%WWWDIR%%/application/vendor/fpdf/font/helveticabi.php +%%WWWDIR%%/application/vendor/fpdf/font/helveticai.php +%%WWWDIR%%/application/vendor/fpdf/font/symbol.php +%%WWWDIR%%/application/vendor/fpdf/font/times.php +%%WWWDIR%%/application/vendor/fpdf/font/timesb.php +%%WWWDIR%%/application/vendor/fpdf/font/timesbi.php +%%WWWDIR%%/application/vendor/fpdf/font/timesi.php +%%WWWDIR%%/application/vendor/fpdf/font/zapfdingbats.php +%%WWWDIR%%/application/vendor/fpdf/fpdf.php +%%WWWDIR%%/application/vendor/fpdf/fpdf_tpl.php +%%WWWDIR%%/application/vendor/fpdf/fpdi.php +%%WWWDIR%%/application/vendor/fpdf/fpdi2tcpdf_bridge.php +%%WWWDIR%%/application/vendor/fpdf/fpdi_pdf_parser.php +%%WWWDIR%%/application/vendor/fpdf/pdf_context.php +%%WWWDIR%%/application/vendor/fpdf/pdf_parser.php %%WWWDIR%%/application/views/basket_box.php %%WWWDIR%%/application/views/debug.php %%WWWDIR%%/application/views/docs.php @@ -392,32 +360,103 @@ %%WWWDIR%%/application/views/widget_menu.sample.php %%WWWDIR%%/application/views/zoom.php %%WWWDIR%%/application/views/zoom_header.php -%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85.php -%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85_FPDI.php -%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW.php -%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW_FPDI.php -%%WWWDIR%%/application/vendor/fpdf/font/courier.php -%%WWWDIR%%/application/vendor/fpdf/font/helvetica.php -%%WWWDIR%%/application/vendor/fpdf/font/helveticab.php -%%WWWDIR%%/application/vendor/fpdf/font/helveticabi.php -%%WWWDIR%%/application/vendor/fpdf/font/helveticai.php -%%WWWDIR%%/application/vendor/fpdf/font/symbol.php -%%WWWDIR%%/application/vendor/fpdf/font/times.php -%%WWWDIR%%/application/vendor/fpdf/font/timesb.php -%%WWWDIR%%/application/vendor/fpdf/font/timesbi.php -%%WWWDIR%%/application/vendor/fpdf/font/timesi.php -%%WWWDIR%%/application/vendor/fpdf/font/zapfdingbats.php -%%WWWDIR%%/application/vendor/fpdf/fpdf.php -%%WWWDIR%%/application/vendor/fpdf/fpdf_tpl.php -%%WWWDIR%%/application/vendor/fpdf/fpdi.php -%%WWWDIR%%/application/vendor/fpdf/fpdi2tcpdf_bridge.php -%%WWWDIR%%/application/vendor/fpdf/fpdi_pdf_parser.php -%%WWWDIR%%/application/vendor/fpdf/pdf_context.php -%%WWWDIR%%/application/vendor/fpdf/pdf_parser.php -%%WWWDIR%%/media/js/jquery-min.js -%%WWWDIR%%/media/js/jquery-ui.min.js -%%WWWDIR%%/media/js/jquery.cluetip.js -%%WWWDIR%%/media/js/zoom.js +%%WWWDIR%%/documents/_media/bulk-npcd.png +%%WWWDIR%%/documents/_media/bulk-npcdmod.png +%%WWWDIR%%/documents/_media/bulk.png +%%WWWDIR%%/documents/_media/nagiospowered-72x72.png +%%WWWDIR%%/documents/_media/pnp-preview-05-08-2009.png +%%WWWDIR%%/documents/_media/popup.png +%%WWWDIR%%/documents/_media/srv_info.png +%%WWWDIR%%/documents/_media/synchronous.png +%%WWWDIR%%/documents/de_DE/about.html +%%WWWDIR%%/documents/de_DE/advanced.html +%%WWWDIR%%/documents/de_DE/config.html +%%WWWDIR%%/documents/de_DE/doc_complete.html +%%WWWDIR%%/documents/de_DE/dwnld.html +%%WWWDIR%%/documents/de_DE/install.html +%%WWWDIR%%/documents/de_DE/modes.html +%%WWWDIR%%/documents/de_DE/new-features.html +%%WWWDIR%%/documents/de_DE/npcd.html +%%WWWDIR%%/documents/de_DE/pages.html +%%WWWDIR%%/documents/de_DE/perfdata_format.html +%%WWWDIR%%/documents/de_DE/rrd_convert.html +%%WWWDIR%%/documents/de_DE/rrdcached.html +%%WWWDIR%%/documents/de_DE/start.html +%%WWWDIR%%/documents/de_DE/timeranges.html +%%WWWDIR%%/documents/de_DE/tpl.html +%%WWWDIR%%/documents/de_DE/tpl_custom.html +%%WWWDIR%%/documents/de_DE/tpl_helper.html +%%WWWDIR%%/documents/de_DE/tpl_helper_pnp.html +%%WWWDIR%%/documents/de_DE/tpl_special.html +%%WWWDIR%%/documents/de_DE/upgrade.html +%%WWWDIR%%/documents/de_DE/verify.html +%%WWWDIR%%/documents/de_DE/verify_pnp_config.html +%%WWWDIR%%/documents/de_DE/webfe.html +%%WWWDIR%%/documents/de_DE/webfe_cfg.html +%%WWWDIR%%/documents/de_DE/wrapper.html +%%WWWDIR%%/documents/de_DE/xport.html +%%WWWDIR%%/documents/en_US/about.html +%%WWWDIR%%/documents/en_US/advanced.html +%%WWWDIR%%/documents/en_US/config.html +%%WWWDIR%%/documents/en_US/doc_complete.html +%%WWWDIR%%/documents/en_US/dwnld.html +%%WWWDIR%%/documents/en_US/install.html +%%WWWDIR%%/documents/en_US/modes.html +%%WWWDIR%%/documents/en_US/new-features.html +%%WWWDIR%%/documents/en_US/npcd.html +%%WWWDIR%%/documents/en_US/pages.html +%%WWWDIR%%/documents/en_US/perfdata_format.html +%%WWWDIR%%/documents/en_US/rrd_convert.html +%%WWWDIR%%/documents/en_US/rrdcached.html +%%WWWDIR%%/documents/en_US/start.html +%%WWWDIR%%/documents/en_US/timeranges.html +%%WWWDIR%%/documents/en_US/tpl.html +%%WWWDIR%%/documents/en_US/tpl_custom.html +%%WWWDIR%%/documents/en_US/tpl_helper.html +%%WWWDIR%%/documents/en_US/tpl_helper_pnp.html +%%WWWDIR%%/documents/en_US/tpl_special.html +%%WWWDIR%%/documents/en_US/upgrade.html +%%WWWDIR%%/documents/en_US/verify.html +%%WWWDIR%%/documents/en_US/verify_pnp_config.html +%%WWWDIR%%/documents/en_US/webfe.html +%%WWWDIR%%/documents/en_US/webfe_cfg.html +%%WWWDIR%%/documents/en_US/wrapper.html +%%WWWDIR%%/documents/en_US/xport.html +%%WWWDIR%%/documents/images/smileys/delete.gif +%%WWWDIR%%/documents/images/smileys/fixme.gif +%%WWWDIR%%/documents/images/smileys/icon_arrow.gif +%%WWWDIR%%/documents/images/smileys/icon_biggrin.gif +%%WWWDIR%%/documents/images/smileys/icon_confused.gif +%%WWWDIR%%/documents/images/smileys/icon_cool.gif +%%WWWDIR%%/documents/images/smileys/icon_cry.gif +%%WWWDIR%%/documents/images/smileys/icon_doubt.gif +%%WWWDIR%%/documents/images/smileys/icon_doubt2.gif +%%WWWDIR%%/documents/images/smileys/icon_eek.gif +%%WWWDIR%%/documents/images/smileys/icon_evil.gif +%%WWWDIR%%/documents/images/smileys/icon_exclaim.gif +%%WWWDIR%%/documents/images/smileys/icon_frown.gif +%%WWWDIR%%/documents/images/smileys/icon_fun.gif +%%WWWDIR%%/documents/images/smileys/icon_idea.gif +%%WWWDIR%%/documents/images/smileys/icon_kaddi.gif +%%WWWDIR%%/documents/images/smileys/icon_lol.gif +%%WWWDIR%%/documents/images/smileys/icon_mrgreen.gif +%%WWWDIR%%/documents/images/smileys/icon_neutral.gif +%%WWWDIR%%/documents/images/smileys/icon_question.gif +%%WWWDIR%%/documents/images/smileys/icon_razz.gif +%%WWWDIR%%/documents/images/smileys/icon_redface.gif +%%WWWDIR%%/documents/images/smileys/icon_rolleyes.gif +%%WWWDIR%%/documents/images/smileys/icon_sad.gif +%%WWWDIR%%/documents/images/smileys/icon_silenced.gif +%%WWWDIR%%/documents/images/smileys/icon_smile.gif +%%WWWDIR%%/documents/images/smileys/icon_smile2.gif +%%WWWDIR%%/documents/images/smileys/icon_surprised.gif +%%WWWDIR%%/documents/images/smileys/icon_twisted.gif +%%WWWDIR%%/documents/images/smileys/icon_wink.gif +%%WWWDIR%%/index.php +%%WWWDIR%%/install.php +%%WWWDIR%%/media/css/autocomplete.css +%%WWWDIR%%/media/css/common.css +%%WWWDIR%%/media/css/shadow.png %%WWWDIR%%/media/css/ui-lightness/images/ui-anim_basic_16x16.gif %%WWWDIR%%/media/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png %%WWWDIR%%/media/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png @@ -434,21 +473,20 @@ %%WWWDIR%%/media/css/ui-lightness/images/ui-icons_ffd27a_256x240.png %%WWWDIR%%/media/css/ui-lightness/images/ui-icons_ffffff_256x240.png %%WWWDIR%%/media/css/ui-lightness/jquery-ui.css -%%WWWDIR%%/media/css/ui-smoothness/images/ui-anim_basic_16x16.gif -%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_222222_256x240.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_2e83ff_256x240.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_454545_256x240.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_888888_256x240.png -%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_cd0a0a_256x240.png -%%WWWDIR%%/media/css/ui-smoothness/jquery-ui.css +%%WWWDIR%%/media/css/ui-multisite/images/contentframe_background.jpg +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_0_aaaaaa_40x100.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_75_709aa5_40x100.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_55_fbf9ee_1x400.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_65_709aa5_1x400.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_75_709aa5_1x400.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_highlight-soft_75_8eaeb8_1x100.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_inset-soft_95_fef1ec_1x100.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_222222_256x240.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_2e83ff_256x240.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_454545_256x240.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_888888_256x240.png +%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_cd0a0a_256x240.png +%%WWWDIR%%/media/css/ui-multisite/jquery-ui.css %%WWWDIR%%/media/css/ui-redmond/images/ui-anim_basic_16x16.gif %%WWWDIR%%/media/css/ui-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png %%WWWDIR%%/media/css/ui-redmond/images/ui-bg_flat_55_fbec88_40x100.png @@ -466,24 +504,23 @@ %%WWWDIR%%/media/css/ui-redmond/images/ui-icons_d8e7f3_256x240.png %%WWWDIR%%/media/css/ui-redmond/images/ui-icons_f9bd01_256x240.png %%WWWDIR%%/media/css/ui-redmond/jquery-ui.css -%%WWWDIR%%/media/css/ui-multisite/images/contentframe_background.jpg -%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_0_aaaaaa_40x100.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_75_709aa5_40x100.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_55_fbf9ee_1x400.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_65_709aa5_1x400.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_75_709aa5_1x400.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_highlight-soft_75_8eaeb8_1x100.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_inset-soft_95_fef1ec_1x100.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_222222_256x240.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_2e83ff_256x240.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_454545_256x240.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_888888_256x240.png -%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_cd0a0a_256x240.png -%%WWWDIR%%/media/css/ui-multisite/jquery-ui.css -%%WWWDIR%%/media/css/autocomplete.css -%%WWWDIR%%/media/css/common.css -%%WWWDIR%%/media/css/shadow.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-anim_basic_16x16.gif +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_222222_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_2e83ff_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_454545_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_888888_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_cd0a0a_256x240.png +%%WWWDIR%%/media/css/ui-smoothness/jquery-ui.css %%WWWDIR%%/media/images/add.png +%%WWWDIR%%/media/images/back.png %%WWWDIR%%/media/images/calendar.gif %%WWWDIR%%/media/images/calendar.png %%WWWDIR%%/media/images/de_DE.png @@ -506,6 +543,10 @@ %%WWWDIR%%/media/images/trends.gif %%WWWDIR%%/media/images/xml.png %%WWWDIR%%/media/images/zoom.png +%%WWWDIR%%/media/js/jquery-min.js +%%WWWDIR%%/media/js/jquery-ui.min.js +%%WWWDIR%%/media/js/jquery.cluetip.js +%%WWWDIR%%/media/js/zoom.js %%WWWDIR%%/templates.dist/check-host-alive.php %%WWWDIR%%/templates.dist/check_dell_bladechassis.php %%WWWDIR%%/templates.dist/check_disk.php @@ -538,12 +579,12 @@ %%WWWDIR%%/templates.dist/check_openmanage.php %%WWWDIR%%/templates.dist/check_oracle_connection-time.php %%WWWDIR%%/templates.dist/check_oracle_health.php -%%WWWDIR%%/templates.dist/check_ping.php %%WWWDIR%%/templates.dist/check_oracle_health_connection-time.php %%WWWDIR%%/templates.dist/check_oracle_health_pga-in-memory-sort-ratio.php %%WWWDIR%%/templates.dist/check_oracle_health_redo-io-traffic.php %%WWWDIR%%/templates.dist/check_oracle_health_switch-interval.php %%WWWDIR%%/templates.dist/check_oracle_health_tablespace-usage.php +%%WWWDIR%%/templates.dist/check_ping.php %%WWWDIR%%/templates.dist/check_ping_tick.php %%WWWDIR%%/templates.dist/check_pnp_rrds.php %%WWWDIR%%/templates.dist/check_smtp.php @@ -561,8 +602,9 @@ %%WWWDIR%%/templates.special/advanced_loop.php-sample %%WWWDIR%%/templates.special/loop.php-sample %%WWWDIR%%/templates.special/static.php-sample -%%WWWDIR%%/index.php -%%WWWDIR%%/install.php +@dirrm %%WWWDIR%%/templates.special +@dirrm %%WWWDIR%%/templates.dist +@dirrmtry %%WWWDIR%%/templates @dirrm %%WWWDIR%%/media/js @dirrm %%WWWDIR%%/media/images @dirrm %%WWWDIR%%/media/css/ui-smoothness/images @@ -575,6 +617,8 @@ @dirrm %%WWWDIR%%/media/css/ui-lightness @dirrm %%WWWDIR%%/media/css @dirrm %%WWWDIR%%/media +@dirrm %%WWWDIR%%/documents/images/smileys +@dirrm %%WWWDIR%%/documents/images @dirrm %%WWWDIR%%/documents/en_US @dirrm %%WWWDIR%%/documents/de_DE @dirrm %%WWWDIR%%/documents/_media @@ -586,6 +630,7 @@ @dirrm %%WWWDIR%%/application/vendor @dirrm %%WWWDIR%%/application/models @dirrm %%WWWDIR%%/application/libraries +@dirrm %%WWWDIR%%/application/lib @dirrm %%WWWDIR%%/application/i18n/ru_RU @dirrm %%WWWDIR%%/application/i18n/fr_FR @dirrm %%WWWDIR%%/application/i18n/es_ES @@ -598,9 +643,6 @@ @dirrm %%WWWDIR%%/application/config @dirrm %%WWWDIR%%/application/cache @dirrm %%WWWDIR%%/application -@dirrmtry %%WWWDIR%%/templates -@dirrm %%WWWDIR%%/templates.dist -@dirrm %%WWWDIR%%/templates.special @dirrmtry %%WWWDIR%% @dirrm lib/kohana/system/views/pagination @dirrm lib/kohana/system/views/kohana @@ -628,6 +670,10 @@ @dirrm lib/kohana/system/config @dirrm lib/kohana/system @dirrm lib/kohana -@dirrmtry etc/pnp/check_commands -@dirrmtry etc/pnp/pages -@dirrmtry etc/pnp +@dirrmtry %%ETCDIR%%/pages +@dirrmtry %%ETCDIR%%/check_commands +@dirrmtry %%ETCDIR%% +@exec mkdir -p %D/%%WWWDIR%%/templates +@exec mkdir -p %D/%%WWWDIR%%/application/libraries +@exec mkdir -p %D/%%WWWDIR%%/application/hooks +@exec mkdir -p %D/%%WWWDIR%%/application/cache Index: files/patch-0010-dont-overwrite-configs =================================================================== RCS file: files/patch-0010-dont-overwrite-configs diff -N files/patch-0010-dont-overwrite-configs --- files/patch-0010-dont-overwrite-configs 23 Nov 2010 22:10:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ -From cccbb033458f205ac74e11babe5021bc7a3ade3c Mon Sep 17 00:00:00 2001 -From: Eygene Ryabinkin -Date: Wed, 17 Nov 2010 19:47:16 +0300 -Subject: [PATCH 1/3] Do not overwrite configuration files - -Install all configuration files as *-sample. - -Signed-off-by: Eygene Ryabinkin ---- - sample-config/Makefile.in | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/sample-config/Makefile.in b/sample-config/Makefile.in -index 883345c..1eac2c1 100644 ---- a/sample-config/Makefile.in -+++ b/sample-config/Makefile.in -@@ -31,14 +31,12 @@ distclean: clean - devclean: distclean - - install: -- -rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php -- - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR) -- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR) -- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR) -+ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample - - install-config: - -@@ -46,7 +44,7 @@ install-config: - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages - -- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR) -+ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR) - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR) - $(INSTALL) -m 644 $(INSTALL_OPTS) misccommands.cfg-sample $(DESTDIR)$(SYSCONFDIR) --- -1.7.2.1 - Index: files/patch-0020-directory-creation =================================================================== RCS file: files/patch-0020-directory-creation diff -N files/patch-0020-directory-creation --- files/patch-0020-directory-creation 23 Nov 2010 22:10:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,124 +0,0 @@ -From 0f6181db74e4a2f53837c5e9b5639cdfb63ee2e1 Mon Sep 17 00:00:00 2001 -From: Eygene Ryabinkin -Date: Thu, 18 Nov 2010 15:22:03 +0300 -Subject: [PATCH 2/3] Rework directory creation during install phase - -Don't create existing system and log-like directories to avoid -changing their permissions. - -Signed-off-by: Eygene Ryabinkin ---- - lib/Makefile.in | 2 +- - sample-config/Makefile.in | 14 +++++++------- - scripts/Makefile.in | 8 ++++---- - share/Makefile.in | 2 +- - src/Makefile.in | 10 +++++----- - 5 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/lib/Makefile.in b/lib/Makefile.in -index b103bc8..0e0f8d8 100644 ---- a/lib/Makefile.in -+++ b/lib/Makefile.in -@@ -22,7 +22,7 @@ devclean: distclean - - install: - -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) -+ [ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana/system - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana/system/controllers -diff --git a/sample-config/Makefile.in b/sample-config/Makefile.in -index 1eac2c1..a841fbb 100644 ---- a/sample-config/Makefile.in -+++ b/sample-config/Makefile.in -@@ -31,19 +31,19 @@ distclean: clean - devclean: distclean - - install: -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages -+ [ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) -+ [ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands -+ [ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR) - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample - - install-config: - -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages -- -+ [ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) -+ [ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands -+ [ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages -+ - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR) - $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR) -diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index 44f0506..8addf27 100644 ---- a/scripts/Makefile.in -+++ b/scripts/Makefile.in -@@ -25,7 +25,7 @@ distclean: clean - devclean: distclean - - install-init: -- $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR) -+ [ -d "$(DESTDIR)$(INIT_DIR)" ] || $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR) - $(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd - - install-processperfdata: -@@ -41,9 +41,9 @@ install-rrdconvert: - $(INSTALL) -m 755 $(INSTALL_OPTS) rrd_convert.pl $(DESTDIR)$(LIBEXECDIR) - - install: -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR) -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/stats -+ [ -d "$(DESTDIR)$(PERFDATADIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR) -+ [ -d "$(DESTDIR)$(LIBEXECDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) -+ [ -d "$(DESTDIR)$(LOGDIR)"/stats ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/stats - $(MAKE) install-processperfdata - $(MAKE) install-plugins - $(MAKE) install-verifyconfig -diff --git a/share/Makefile.in b/share/Makefile.in -index 2c4c55d..fd6713d 100644 ---- a/share/Makefile.in -+++ b/share/Makefile.in -@@ -22,7 +22,7 @@ distclean: clean - devclean: distclean - - install: -- $(INSTALL) -m 777 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/kohana -+ [ -d "$(DESTDIR)$(LOGDIR)"/kohana ] || $(INSTALL) -m 777 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/kohana - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR) - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/documents - $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/documents/_media -diff --git a/src/Makefile.in b/src/Makefile.in -index b4323b4..9439f25 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -124,11 +124,11 @@ install-unstripped: - $(MAKE) install-basic - - install-basic: -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) -- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_DIR) -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR) -+ [ -d "$(DESTDIR)$(BINDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -+ [ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) -+ [ -d "$(DESTDIR)$(LOGDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) -+ [ -d "$(DESTDIR)$(PERFDATA_DIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_DIR) -+ [ -d "$(DESTDIR)$(PERFDATA_SPOOL_DIR)" ] || $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR) - $(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR) - $(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod.o $(DESTDIR)$(LIBDIR) - --- -1.7.2.1 - Index: files/patch-lib__Makefile.in =================================================================== RCS file: files/patch-lib__Makefile.in diff -N files/patch-lib__Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-lib__Makefile.in 18 Dec 2010 21:11:39 -0000 @@ -0,0 +1,11 @@ +--- ./lib/Makefile.in.orig 2010-12-15 14:39:40.000000000 +0100 ++++ ./lib/Makefile.in 2010-12-18 19:54:07.000000000 +0100 +@@ -22,7 +22,7 @@ + + install: + +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) ++ [ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana/system + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)/kohana/system/controllers Index: files/patch-sample-config__Makefile.in =================================================================== RCS file: files/patch-sample-config__Makefile.in diff -N files/patch-sample-config__Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-sample-config__Makefile.in 18 Dec 2010 21:11:39 -0000 @@ -0,0 +1,43 @@ +--- ./sample-config/Makefile.in.orig 2010-12-15 14:39:40.000000000 +0100 ++++ ./sample-config/Makefile.in 2010-12-18 19:56:36.000000000 +0100 +@@ -31,22 +31,21 @@ + devclean: distclean + + install: +- -rm -f $(DESTDIR)$(HTMLDIR)/conf/config.php + +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages ++ [ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) ++ [ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands ++ [ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR) +- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR) +- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR) ++ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample + + install-config: + +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages ++ [ -d "$(DESTDIR)$(SYSCONFDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR) ++ [ -d "$(DESTDIR)$(SYSCONFDIR)"/check_commands ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands ++ [ -d "$(DESTDIR)$(SYSCONFDIR)"/pages ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages + +- $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR) ++ $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php-sample + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR) + $(INSTALL) -m 644 $(INSTALL_OPTS) pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR) + $(INSTALL) -m 644 $(INSTALL_OPTS) misccommands.cfg-sample $(DESTDIR)$(SYSCONFDIR) +@@ -64,7 +63,7 @@ + + install-webconf: + +- $(INSTALL) -m 644 httpd.conf $(DESTDIR)$(HTTPD_CONF)/$(PKG_NAME).conf ++ $(INSTALL) -m 644 httpd.conf $(DESTDIR)$(HTTPD_CONF)/$(PKG_NAME)-apache.conf-sample + + @echo "" + @echo "*** Apache config file installed ***" Index: files/patch-scripts__Makefile.in =================================================================== RCS file: files/patch-scripts__Makefile.in diff -N files/patch-scripts__Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-scripts__Makefile.in 18 Dec 2010 21:11:39 -0000 @@ -0,0 +1,24 @@ +--- ./scripts/Makefile.in.orig 2010-12-15 14:39:40.000000000 +0100 ++++ ./scripts/Makefile.in 2010-12-18 19:54:08.000000000 +0100 +@@ -25,7 +25,7 @@ + devclean: distclean + + install-init: +- $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR) ++ [ -d "$(DESTDIR)$(INIT_DIR)" ] || $(INSTALL) -m 755 $(INIT_OPTS) -d $(DESTDIR)$(INIT_DIR) + $(INSTALL) -m 755 $(INIT_OPTS) rc.npcd $(DESTDIR)$(INIT_DIR)/npcd + + install-processperfdata: +@@ -41,9 +41,9 @@ + $(INSTALL) -m 755 $(INSTALL_OPTS) rrd_convert.pl $(DESTDIR)$(LIBEXECDIR) + + install: +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/stats ++ [ -d "$(DESTDIR)$(PERFDATADIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATADIR) ++ [ -d "$(DESTDIR)$(LIBEXECDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) ++ [ -d "$(DESTDIR)$(LOGDIR)"/stats ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/stats + $(MAKE) install-processperfdata + $(MAKE) install-plugins + $(MAKE) install-verifyconfig Index: files/patch-share__Makefile.in =================================================================== RCS file: files/patch-share__Makefile.in diff -N files/patch-share__Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-share__Makefile.in 18 Dec 2010 21:11:39 -0000 @@ -0,0 +1,11 @@ +--- ./share/Makefile.in.orig 2010-12-15 14:39:40.000000000 +0100 ++++ ./share/Makefile.in 2010-12-18 19:54:08.000000000 +0100 +@@ -22,7 +22,7 @@ + devclean: distclean + + install: +- $(INSTALL) -m 777 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/kohana ++ [ -d "$(DESTDIR)$(LOGDIR)"/kohana ] || $(INSTALL) -m 777 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/kohana + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/documents + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/documents/_media Index: files/patch-src__Makefile.in =================================================================== RCS file: files/patch-src__Makefile.in diff -N files/patch-src__Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src__Makefile.in 18 Dec 2010 21:11:39 -0000 @@ -0,0 +1,19 @@ +--- ./src/Makefile.in.orig 2010-12-15 14:39:40.000000000 +0100 ++++ ./src/Makefile.in 2010-12-18 19:54:08.000000000 +0100 +@@ -124,11 +124,11 @@ + $(MAKE) install-basic + + install-basic: +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_DIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR) ++ [ -d "$(DESTDIR)$(BINDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) ++ [ -d "$(DESTDIR)$(LIBDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR) ++ [ -d "$(DESTDIR)$(LOGDIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) ++ [ -d "$(DESTDIR)$(PERFDATA_DIR)" ] || $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_DIR) ++ [ -d "$(DESTDIR)$(PERFDATA_SPOOL_DIR)" ] || $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR) + $(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR) + $(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod.o $(DESTDIR)$(LIBDIR) + Index: files/pkg-message.in =================================================================== RCS file: /home/pcvs/ports/net-mgmt/pnp/files/pkg-message.in,v retrieving revision 1.3 diff -u -r1.3 pkg-message.in --- files/pkg-message.in 23 Nov 2010 22:10:20 -0000 1.3 +++ files/pkg-message.in 18 Dec 2010 21:11:39 -0000 @@ -12,27 +12,36 @@ configuration for the PNP area: {{{ # PNP graphing tool -Alias /nagios/pnp %%WWWDIR%% - - Order deny,allow - Allow from all - Deny from all - - AddHandler application/x-httpd-php .php - DirectoryIndex index.php - - RewriteEngine on - RewriteBase /nagios/pnp/ - # Protect application and system files from being viewed - RewriteRule ^(application|modules|system) - [F,L] - # Allow any files or directories that exist to be displayed directly - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - # Rewrite all other URLs to index.php/URL - RewriteRule .* index.php/$0 [PT,L] +Alias %%PNP_URL%% "%%WWWDIR%%" + + AllowOverride None + Order allow,deny + Allow from all + # + # Use the same value as defined in nagios.conf + # + AuthName "Nagios Access" + AuthType Basic + AuthUserFile %%LOCALBASE%%/etc/nagios/htpasswd.users + Require valid-user + + RewriteEngine on + # Installation directory + RewriteBase %%PNP_URL%%/ + # Protect application and system files from being viewed + RewriteRule ^(application|modules|system) - [F,L] + # Allow any files or directories that exist to be displayed directly + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + # Rewrite all other URLs to index.php/URL + RewriteRule .* index.php/$0 [PT,L] + }}} +A sample config is installed as + %%ETCDIR%%/pnp-apache.conf-sample + Create %%WWWDIR%%/install.ignore to disable sanity check and start using PNP. --- patch_pnp-0-6.10.txt ends here --- --- genplist_pnp.txt begins here --- #!/bin/sh # # file ~/.genplist/pnp # additional genplist command for net-mgmt/pnp sed -i '' -E -e 's;^(@dirrm) (%%WWWDIR%%/templates$|%%WWWDIR%%$|%%ETCDIR%%/pages$|%%ETCDIR%%/check_commands$|%%ETCDIR%%$);\1try \2;' ${1} --- genplist_pnp.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted: