Date: Wed, 10 Oct 2012 21:35:37 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305688 - head/net-mgmt/nagvis Message-ID: <201210102135.q9ALZbxP006377@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Oct 10 21:35:37 2012 New Revision: 305688 URL: http://svn.freebsd.org/changeset/ports/305688 Log: - Update to 1.7.1 - Convert to new options framework - Trim Makefile headers PR: ports/172271 Submitted by: Andrew Sidorov <derfi@vei.ru> (maintainer) Feature safe: yes Modified: head/net-mgmt/nagvis/Makefile (contents, props changed) head/net-mgmt/nagvis/distinfo (contents, props changed) head/net-mgmt/nagvis/pkg-plist (contents, props changed) Modified: head/net-mgmt/nagvis/Makefile ============================================================================== --- head/net-mgmt/nagvis/Makefile Wed Oct 10 21:31:36 2012 (r305687) +++ head/net-mgmt/nagvis/Makefile Wed Oct 10 21:35:37 2012 (r305688) @@ -1,29 +1,28 @@ -# New ports collection makefile for: nagvis -# Date created: 5 October 2010 -# Whom: Andrew 'derfi' Sidorov -# +# Created by: Andrew 'derfi' Sidorov <derfi@vei.ru> # $FreeBSD$ -# PORTNAME= nagvis -PORTVERSION= 1.5.9 +PORTVERSION= 1.7.1 CATEGORIES= net-mgmt MASTER_SITES= SF -MASTER_SITE_SUBDIR=${PORTNAME}/NagVis%201.5 +MASTER_SITE_SUBDIR=${PORTNAME}/NagVis%201.7 MAINTAINER= derfi@vei.ru COMMENT= NagVis is a visualization addon for Nagios LICENSE= GPLv2 -OPTIONS= MKLIVESTATUS "depend on mk-livestatus broker (preferred)" on \ - NDO2DB "depend on ndo2db broker" off \ - GRAPHVIZ "graphviz is needed for automaps" off +OPTIONS_DEFINE= GRAPHVIZ +OPTIONS_SINGLE= BROKER +OPTIONS_SINGLE_BROKER= MKLIVESTATUS NDO2DB +OPTIONS_DEFAULT= MKLIVESTATUS +MKLIVESTATUS_DESC= Depend on mk-livestatus broker (preferred) +NDO2DB_DESC= Depend on ndo2db broker +GRAPHVIZ_DESC= Graphviz is needed for automaps NO_BUILD= yes USE_PHP= gd gettext mbstring session json pdo pdo_sqlite WANT_PHP_WEB= yes -DEFAULT_PHP_VER=5 .include <bsd.port.options.mk> @@ -36,24 +35,19 @@ SUB_LIST+= WWW_OWNER=${WWW_OWNER} WWW_GR DIRMODE=${DIRMODE} FILEMODE=${FILEMODE} SUB_FILES+= pkg-install pkg-deinstall -.if defined(WITH_NDO2DB) +.if ${PORT_OPTIONS:MNDO2DB} USE_PHP+= mysql RUN_DEPENDS+= ndo2db-3x:${PORTSDIR}/net-mgmt/ndoutils .endif -.if defined(WITH_MKLIVESTATUS) +.if ${PORT_OPTIONS:MMKLIVESTATUS} RUN_DEPENDS+= mk-livestatus>=0:${PORTSDIR}/net-mgmt/mk-livestatus .endif -.if defined(WITH_GRAPHVIZ) +.if ${PORT_OPTIONS:MGRAPHVIZ} RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz .endif -check-sanity: -.if !defined(WITH_NDO2DB) && !defined(WITH_MKLIVESTATUS) -IGNORE= please choose at least one nagios broker module -.endif - post-extract: @${RM} -f ${WRKSRC}/.gitignore ${WRKSRC}/install.sh ${WRKSRC}/INSTALL Modified: head/net-mgmt/nagvis/distinfo ============================================================================== --- head/net-mgmt/nagvis/distinfo Wed Oct 10 21:31:36 2012 (r305687) +++ head/net-mgmt/nagvis/distinfo Wed Oct 10 21:35:37 2012 (r305688) @@ -1,2 +1,2 @@ -SHA256 (nagvis-1.5.9.tar.gz) = c0911a474563a8bd78e2454e8cd0f5c2cd8b83891869ada31d4d7ed0abddcbaa -SIZE (nagvis-1.5.9.tar.gz) = 3298253 +SHA256 (nagvis-1.7.1.tar.gz) = 42c8a239e5f992385c678ab95f1b90e0a3304fbad033e8ca9dd1d64a16644173 +SIZE (nagvis-1.7.1.tar.gz) = 3488146 Modified: head/net-mgmt/nagvis/pkg-plist ============================================================================== --- head/net-mgmt/nagvis/pkg-plist Wed Oct 10 21:31:36 2012 (r305687) +++ head/net-mgmt/nagvis/pkg-plist Wed Oct 10 21:35:37 2012 (r305688) @@ -1,6 +1,8 @@ %%WWWDIR%%/ChangeLog %%WWWDIR%%/LICENCE %%WWWDIR%%/README +%%WWWDIR%%/TODO +%%WWWDIR%%/docs/cleanup_new_notes.sh %%WWWDIR%%/docs/de_DE/about.html %%WWWDIR%%/docs/de_DE/after_installation.html %%WWWDIR%%/docs/de_DE/auth.html @@ -8,6 +10,7 @@ %%WWWDIR%%/docs/de_DE/authorisation_roles_perms.html %%WWWDIR%%/docs/de_DE/automap.html %%WWWDIR%%/docs/de_DE/automap_config_format.html +%%WWWDIR%%/docs/de_DE/backend_nagiosbp.html %%WWWDIR%%/docs/de_DE/backends.html %%WWWDIR%%/docs/de_DE/changelog.html %%WWWDIR%%/docs/de_DE/changelog2.html @@ -40,6 +43,9 @@ %%WWWDIR%%/docs/en_US/authorisation_roles_perms.html %%WWWDIR%%/docs/en_US/automap.html %%WWWDIR%%/docs/en_US/automap_config_format.html +%%WWWDIR%%/docs/en_US/backend_mklivestatus.html +%%WWWDIR%%/docs/en_US/backend_nagiosbp.html +%%WWWDIR%%/docs/en_US/backend_ndomy.html %%WWWDIR%%/docs/en_US/backends.html %%WWWDIR%%/docs/en_US/changelog.html %%WWWDIR%%/docs/en_US/context_templates.html @@ -49,14 +55,17 @@ %%WWWDIR%%/docs/en_US/extending/shapes.html %%WWWDIR%%/docs/en_US/extending/templates.html %%WWWDIR%%/docs/en_US/gadgets.html +%%WWWDIR%%/docs/en_US/geomap.html %%WWWDIR%%/docs/en_US/header_templates.html %%WWWDIR%%/docs/en_US/hover_templates.html %%WWWDIR%%/docs/en_US/index.html +%%WWWDIR%%/docs/en_US/install_omd_site.html %%WWWDIR%%/docs/en_US/installation_instructions.html %%WWWDIR%%/docs/en_US/installer.html %%WWWDIR%%/docs/en_US/lines_weathermap_style.html %%WWWDIR%%/docs/en_US/logon_modules.html %%WWWDIR%%/docs/en_US/map_config_format_description.html +%%WWWDIR%%/docs/en_US/maps.html %%WWWDIR%%/docs/en_US/nagvis_config_format_description.html %%WWWDIR%%/docs/en_US/system_requirements.html %%WWWDIR%%/docs/en_US/toc.html @@ -79,23 +88,29 @@ %%WWWDIR%%/docs/general/img/std_speedo2.png %%WWWDIR%%/etc/.htaccess %%WWWDIR%%/etc/apache2-nagvis.conf-sample -%%WWWDIR%%/etc/automaps/__automap.cfg +%%WWWDIR%%/etc/conf.d/demo.ini.php +%%WWWDIR%%/etc/geomap/demo-locations.csv %%WWWDIR%%/etc/geomap/links.xml %%WWWDIR%%/etc/geomap/locations.xml %%WWWDIR%%/etc/geomap/settings.xml %%WWWDIR%%/etc/geomap/viewpoints.xml -%%WWWDIR%%/etc/maps/demo-map.cfg -%%WWWDIR%%/etc/maps/demo-server.cfg -%%WWWDIR%%/etc/maps/demo.cfg -%%WWWDIR%%/etc/maps/demo2.cfg +%%WWWDIR%%/etc/maps/demo-automap.cfg +%%WWWDIR%%/etc/maps/demo-automap2.cfg +%%WWWDIR%%/etc/maps/demo-geomap.cfg +%%WWWDIR%%/etc/maps/demo-germany.cfg +%%WWWDIR%%/etc/maps/demo-ham-racks.cfg +%%WWWDIR%%/etc/maps/demo-load.cfg +%%WWWDIR%%/etc/maps/demo-muc-srv1.cfg +%%WWWDIR%%/etc/maps/demo-overview.cfg %%WWWDIR%%/etc/nagvis.ini.php-sample +%%WWWDIR%%/install_lib +%%WWWDIR%%/nagvis-make-admin +%%WWWDIR%%/omd_install.sh +%%WWWDIR%%/pack %%WWWDIR%%/share/config.php %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendMessage.php -%%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModAutoMap.php %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModInfo.php %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModLogonDialog.php -%%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModLogonEnv.php -%%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModLogonMixed.php %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModMap.php %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModOverview.php %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModRotation.php @@ -105,7 +120,6 @@ %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendRequestHandler.php %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendRotation.php %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendTemplateSystem.php -%%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisAutoMapView.php %%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php %%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisIndexView.php %%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisInfoView.php @@ -113,7 +127,6 @@ %%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisMapView.php %%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisOverviewView.php %%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisUrlView.php -%%WWWDIR%%/share/frontend/nagvis-js/css/frontendEventlog.css %%WWWDIR%%/share/frontend/nagvis-js/defines/nagvis-js.php %%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/CHANGELOG %%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/Dwoo.compiled.php @@ -221,8 +234,10 @@ %%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/plugins/builtin/functions/wordwrap.php %%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/plugins/builtin/helper.array.php %%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/plugins/builtin/processors/pre.smarty_compat.php +%%WWWDIR%%/share/frontend/nagvis-js/images/help_icon.png %%WWWDIR%%/share/frontend/nagvis-js/images/internal/10x10.gif %%WWWDIR%%/share/frontend/nagvis-js/images/internal/confirm.png +%%WWWDIR%%/share/frontend/nagvis-js/images/internal/dimension.png %%WWWDIR%%/share/frontend/nagvis-js/images/internal/favicon.png %%WWWDIR%%/share/frontend/nagvis-js/images/internal/favicon_ack.png %%WWWDIR%%/share/frontend/nagvis-js/images/internal/favicon_critical.png @@ -247,10 +262,24 @@ %%WWWDIR%%/share/frontend/nagvis-js/images/internal/msg_unreachable.png %%WWWDIR%%/share/frontend/nagvis-js/images/internal/msg_up.png %%WWWDIR%%/share/frontend/nagvis-js/images/internal/msg_warning.png +%%WWWDIR%%/share/frontend/nagvis-js/images/internal/picker.png %%WWWDIR%%/share/frontend/nagvis-js/images/internal/warning.png +%%WWWDIR%%/share/frontend/nagvis-js/images/jscolor/arrow.gif +%%WWWDIR%%/share/frontend/nagvis-js/images/jscolor/cross.gif +%%WWWDIR%%/share/frontend/nagvis-js/images/jscolor/hs.png +%%WWWDIR%%/share/frontend/nagvis-js/images/jscolor/hv.png %%WWWDIR%%/share/frontend/nagvis-js/index.php %%WWWDIR%%/share/frontend/nagvis-js/js/ExtBase.js +%%WWWDIR%%/share/frontend/nagvis-js/js/ExtGenericResize.js +%%WWWDIR%%/share/frontend/nagvis-js/js/ExtJSColor.js %%WWWDIR%%/share/frontend/nagvis-js/js/ExtStacktrace.js +%%WWWDIR%%/share/frontend/nagvis-js/js/ExtWzJsGraphics.js +%%WWWDIR%%/share/frontend/nagvis-js/js/ManageBackends.js +%%WWWDIR%%/share/frontend/nagvis-js/js/ManageBackgrounds.js +%%WWWDIR%%/share/frontend/nagvis-js/js/ManageMaps.js +%%WWWDIR%%/share/frontend/nagvis-js/js/ManageShapes.js +%%WWWDIR%%/share/frontend/nagvis-js/js/MapManageTmpl.js +%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisContainer.js %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisHost.js %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisHostgroup.js %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisLine.js @@ -264,7 +293,9 @@ %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisStatelessObject.js %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisTextbox.js %%WWWDIR%%/share/frontend/nagvis-js/js/ajax.js +%%WWWDIR%%/share/frontend/nagvis-js/js/ajaxActions.js %%WWWDIR%%/share/frontend/nagvis-js/js/dynfavicon.js +%%WWWDIR%%/share/frontend/nagvis-js/js/edit.js %%WWWDIR%%/share/frontend/nagvis-js/js/frontend.js %%WWWDIR%%/share/frontend/nagvis-js/js/frontendContext.js %%WWWDIR%%/share/frontend/nagvis-js/js/frontendEventlog.js @@ -274,7 +305,6 @@ %%WWWDIR%%/share/frontend/nagvis-js/js/lines.js %%WWWDIR%%/share/frontend/nagvis-js/js/nagvis.js %%WWWDIR%%/share/frontend/nagvis-js/js/popupWindow.js -%%WWWDIR%%/share/frontend/nagvis-js/js/wz_jsgraphics.js %%WWWDIR%%/share/frontend/nagvis-js/locale/de_DE/LC_MESSAGES/nagvis.mo %%WWWDIR%%/share/frontend/nagvis-js/locale/de_DE/LC_MESSAGES/nagvis.po %%WWWDIR%%/share/frontend/nagvis-js/locale/en_US/LC_MESSAGES/nagvis.mo @@ -287,40 +317,6 @@ %%WWWDIR%%/share/frontend/nagvis-js/locale/pt_BR/LC_MESSAGES/nagvis.po %%WWWDIR%%/share/frontend/nagvis-js/locale/ru_RU/LC_MESSAGES/nagvis.mo %%WWWDIR%%/share/frontend/nagvis-js/locale/ru_RU/LC_MESSAGES/nagvis.po -%%WWWDIR%%/share/frontend/wui/classes/WuiCore.php -%%WWWDIR%%/share/frontend/wui/classes/WuiHeaderMenu.php -%%WWWDIR%%/share/frontend/wui/classes/WuiMainCfg.php -%%WWWDIR%%/share/frontend/wui/classes/WuiMap.php -%%WWWDIR%%/share/frontend/wui/classes/WuiModLogonDialog.php -%%WWWDIR%%/share/frontend/wui/classes/WuiModLogonEnv.php -%%WWWDIR%%/share/frontend/wui/classes/WuiModLogonMixed.php -%%WWWDIR%%/share/frontend/wui/classes/WuiModMap.php -%%WWWDIR%%/share/frontend/wui/classes/WuiModWelcome.php -%%WWWDIR%%/share/frontend/wui/classes/WuiModule.php -%%WWWDIR%%/share/frontend/wui/classes/WuiModuleHandler.php -%%WWWDIR%%/share/frontend/wui/classes/WuiPage.php -%%WWWDIR%%/share/frontend/wui/classes/WuiViewIndex.php -%%WWWDIR%%/share/frontend/wui/classes/WuiViewMap.php -%%WWWDIR%%/share/frontend/wui/classes/WuiViewWelcome.php -%%WWWDIR%%/share/frontend/wui/css/wui.css -%%WWWDIR%%/share/frontend/wui/defines/wui.php -%%WWWDIR%%/share/frontend/wui/images/clone.png -%%WWWDIR%%/share/frontend/wui/images/delete.png -%%WWWDIR%%/share/frontend/wui/images/help_icon.png -%%WWWDIR%%/share/frontend/wui/images/modify.png -%%WWWDIR%%/share/frontend/wui/images/move.png -%%WWWDIR%%/share/frontend/wui/index.php -%%WWWDIR%%/share/frontend/wui/js/EditMainCfg.js -%%WWWDIR%%/share/frontend/wui/js/ExtGenericResize.js -%%WWWDIR%%/share/frontend/wui/js/ManageBackends.js -%%WWWDIR%%/share/frontend/wui/js/ManageBackgrounds.js -%%WWWDIR%%/share/frontend/wui/js/ManageMaps.js -%%WWWDIR%%/share/frontend/wui/js/ManageShapes.js -%%WWWDIR%%/share/frontend/wui/js/MapManageTmpl.js -%%WWWDIR%%/share/frontend/wui/js/addmodify.js -%%WWWDIR%%/share/frontend/wui/js/ajax.js -%%WWWDIR%%/share/frontend/wui/js/wui.js -%%WWWDIR%%/share/frontend/wui/js/wz_jsgraphics.js %%WWWDIR%%/share/index.php %%WWWDIR%%/share/netmap/GeocodeService.php %%WWWDIR%%/share/netmap/Host.php @@ -401,21 +397,24 @@ %%WWWDIR%%/share/server/core/classes/CoreAuthHandler.php %%WWWDIR%%/share/server/core/classes/CoreAuthModMySQL.php %%WWWDIR%%/share/server/core/classes/CoreAuthModSQLite.php -%%WWWDIR%%/share/server/core/classes/CoreAuthModSession.php %%WWWDIR%%/share/server/core/classes/CoreAuthModule.php %%WWWDIR%%/share/server/core/classes/CoreAuthorisationHandler.php +%%WWWDIR%%/share/server/core/classes/CoreAuthorisationModMultisite.php %%WWWDIR%%/share/server/core/classes/CoreAuthorisationModMySQL.php %%WWWDIR%%/share/server/core/classes/CoreAuthorisationModSQLite.php %%WWWDIR%%/share/server/core/classes/CoreAuthorisationModule.php %%WWWDIR%%/share/server/core/classes/CoreBackendMgmt.php %%WWWDIR%%/share/server/core/classes/CoreExceptions.php %%WWWDIR%%/share/server/core/classes/CoreLog.php -%%WWWDIR%%/share/server/core/classes/CoreMessage.php +%%WWWDIR%%/share/server/core/classes/CoreLogonDialogHandler.php +%%WWWDIR%%/share/server/core/classes/CoreLogonEnv.php +%%WWWDIR%%/share/server/core/classes/CoreLogonMixed.php +%%WWWDIR%%/share/server/core/classes/CoreLogonModule.php +%%WWWDIR%%/share/server/core/classes/CoreLogonMultisite.php +%%WWWDIR%%/share/server/core/classes/CoreModAction.php %%WWWDIR%%/share/server/core/classes/CoreModAuth.php -%%WWWDIR%%/share/server/core/classes/CoreModAutoMap.php %%WWWDIR%%/share/server/core/classes/CoreModChangePassword.php %%WWWDIR%%/share/server/core/classes/CoreModGeneral.php -%%WWWDIR%%/share/server/core/classes/CoreModLogonEnv.php %%WWWDIR%%/share/server/core/classes/CoreModMainCfg.php %%WWWDIR%%/share/server/core/classes/CoreModManageBackgrounds.php %%WWWDIR%%/share/server/core/classes/CoreModManageShapes.php @@ -425,6 +424,7 @@ %%WWWDIR%%/share/server/core/classes/CoreModRoleMgmt.php %%WWWDIR%%/share/server/core/classes/CoreModSearch.php %%WWWDIR%%/share/server/core/classes/CoreModUrl.php +%%WWWDIR%%/share/server/core/classes/CoreModUser.php %%WWWDIR%%/share/server/core/classes/CoreModUserMgmt.php %%WWWDIR%%/share/server/core/classes/CoreModule.php %%WWWDIR%%/share/server/core/classes/CoreModuleHandler.php @@ -435,10 +435,12 @@ %%WWWDIR%%/share/server/core/classes/CoreSessionHandler.php %%WWWDIR%%/share/server/core/classes/CoreTemplateSystem.php %%WWWDIR%%/share/server/core/classes/CoreUriHandler.php +%%WWWDIR%%/share/server/core/classes/CoreUserCfg.php %%WWWDIR%%/share/server/core/classes/GlobalBackendInterface.php %%WWWDIR%%/share/server/core/classes/GlobalBackendTest.php %%WWWDIR%%/share/server/core/classes/GlobalBackendmerlinmy.php %%WWWDIR%%/share/server/core/classes/GlobalBackendmklivestatus.php +%%WWWDIR%%/share/server/core/classes/GlobalBackendnagiosbp.php %%WWWDIR%%/share/server/core/classes/GlobalBackendndomy.php %%WWWDIR%%/share/server/core/classes/GlobalBackground.php %%WWWDIR%%/share/server/core/classes/GlobalCore.php @@ -448,23 +450,18 @@ %%WWWDIR%%/share/server/core/classes/GlobalMainCfg.php %%WWWDIR%%/share/server/core/classes/GlobalMap.php %%WWWDIR%%/share/server/core/classes/GlobalMapCfg.php -%%WWWDIR%%/share/server/core/classes/GlobalMessage.php -%%WWWDIR%%/share/server/core/classes/NagVisAutoMap.php -%%WWWDIR%%/share/server/core/classes/NagVisAutomapCfg.php %%WWWDIR%%/share/server/core/classes/NagVisContextMenu.php %%WWWDIR%%/share/server/core/classes/NagVisHoverMenu.php %%WWWDIR%%/share/server/core/classes/NagVisHoverUrl.php %%WWWDIR%%/share/server/core/classes/NagVisMap.php %%WWWDIR%%/share/server/core/classes/NagVisMapCfg.php %%WWWDIR%%/share/server/core/classes/NagVisUrl.php -%%WWWDIR%%/share/server/core/classes/NagVisViewAutomapModifyParams.php -%%WWWDIR%%/share/server/core/classes/NagVisViewAutomapToMap.php +%%WWWDIR%%/share/server/core/classes/NagVisViewAck.php %%WWWDIR%%/share/server/core/classes/NagVisViewChangePassword.php %%WWWDIR%%/share/server/core/classes/NagVisViewManageRoles.php %%WWWDIR%%/share/server/core/classes/NagVisViewSearch.php +%%WWWDIR%%/share/server/core/classes/NagVisViewToStaticMap.php %%WWWDIR%%/share/server/core/classes/NagVisViewUserMgmt.php -%%WWWDIR%%/share/server/core/classes/WuiForm.php -%%WWWDIR%%/share/server/core/classes/WuiMapCfg.php %%WWWDIR%%/share/server/core/classes/WuiViewEditMainCfg.php %%WWWDIR%%/share/server/core/classes/WuiViewManageBackends.php %%WWWDIR%%/share/server/core/classes/WuiViewManageBackgrounds.php @@ -472,6 +469,7 @@ %%WWWDIR%%/share/server/core/classes/WuiViewManageShapes.php %%WWWDIR%%/share/server/core/classes/WuiViewMapAddModify.php %%WWWDIR%%/share/server/core/classes/WuiViewMapManageTmpl.php +%%WWWDIR%%/share/server/core/classes/objects/NagVisContainer.php %%WWWDIR%%/share/server/core/classes/objects/NagVisHost.php %%WWWDIR%%/share/server/core/classes/objects/NagVisHostgroup.php %%WWWDIR%%/share/server/core/classes/objects/NagVisLine.php @@ -495,97 +493,141 @@ %%WWWDIR%%/share/server/core/ext/php-gettext-1.0.9/gettext.inc %%WWWDIR%%/share/server/core/ext/php-gettext-1.0.9/gettext.php %%WWWDIR%%/share/server/core/ext/php-gettext-1.0.9/streams.php -%%WWWDIR%%/share/server/core/functions/ajaxErrorHandler.php %%WWWDIR%%/share/server/core/functions/autoload.php +%%WWWDIR%%/share/server/core/functions/core.php %%WWWDIR%%/share/server/core/functions/debug.php +%%WWWDIR%%/share/server/core/functions/index.php +%%WWWDIR%%/share/server/core/functions/nagvisErrorHandler.php %%WWWDIR%%/share/server/core/functions/oldPhpVersionFixes.php +%%WWWDIR%%/share/server/core/mapcfg/default.php +%%WWWDIR%%/share/server/core/sources/.gitignore +%%WWWDIR%%/share/server/core/sources/automap.php +%%WWWDIR%%/share/server/core/sources/automap_pos.php +%%WWWDIR%%/share/server/core/sources/filter.php +%%WWWDIR%%/share/server/core/sources/general.php +%%WWWDIR%%/share/server/core/sources/geomap.php %%WWWDIR%%/share/userfiles/gadgets/gadgets_core.php %%WWWDIR%%/share/userfiles/gadgets/std_bar.php +%%WWWDIR%%/share/userfiles/gadgets/std_html_bar.php %%WWWDIR%%/share/userfiles/gadgets/std_speedometer.php %%WWWDIR%%/share/userfiles/gadgets/std_speedometer2.php -%%WWWDIR%%/share/userfiles/images/gadgets/dummy +%%WWWDIR%%/share/userfiles/images/gadgets/.gitignore %%WWWDIR%%/share/userfiles/images/iconsets/20x20.gif -%%WWWDIR%%/share/userfiles/images/iconsets/configerror_large.png -%%WWWDIR%%/share/userfiles/images/iconsets/configerror_medium.png -%%WWWDIR%%/share/userfiles/images/iconsets/configerror_small.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_ack.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_critical.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_down.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_error.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_ok.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_sack.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_unknown.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_up.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_landscape_warning.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_ack.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_critical.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_down.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_error.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_ok.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_sack.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_unknown.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_up.png -%%WWWDIR%%/share/userfiles/images/iconsets/demo_state_warning.png -%%WWWDIR%%/share/userfiles/images/iconsets/error.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_big_ack.png %%WWWDIR%%/share/userfiles/images/iconsets/std_big_critical.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_critical_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_critical_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_big_down.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_big_downtime.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_down_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_down_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_big_error.png %%WWWDIR%%/share/userfiles/images/iconsets/std_big_ok.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_ok_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_big_pending.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_big_sack.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_big_sdowntime.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_unchecked.png %%WWWDIR%%/share/userfiles/images/iconsets/std_big_unknown.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_unknown_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_unknown_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_unreachable.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_unreachable_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_unreachable_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_big_up.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_up_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_big_warning.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_warning_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_big_warning_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_critical.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_critical_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_critical_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_down.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_down_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_down_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_error.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_ok.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_ok_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_pending.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unchecked.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unknown.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unknown_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unknown_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unreachable.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unreachable_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unreachable_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_up.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_up_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_down.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_downtime.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_down_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_down_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_error.png %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_ok.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_ok_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_pending.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_sack.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_sdowntime.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unchecked.png %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unknown.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unknown_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unknown_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unreachable.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unreachable_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unreachable_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_up.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_up_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_warning.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_small_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_warning_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_warning_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_small_down.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_small_downtime.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_down_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_down_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_small_error.png %%WWWDIR%%/share/userfiles/images/iconsets/std_small_ok.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_ok_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_small_pending.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_small_sack.png -%%WWWDIR%%/share/userfiles/images/iconsets/std_small_sdowntime.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unchecked.png %%WWWDIR%%/share/userfiles/images/iconsets/std_small_unknown.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unknown_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unknown_dt.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unreachable.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unreachable_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unreachable_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_small_up.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_up_dt.png %%WWWDIR%%/share/userfiles/images/iconsets/std_small_warning.png -%%WWWDIR%%/share/userfiles/images/maps/demo_background.png -%%WWWDIR%%/share/userfiles/images/maps/nagvis-demo.png -%%WWWDIR%%/share/userfiles/images/shapes/demo-load.png -%%WWWDIR%%/share/userfiles/images/shapes/demo-server.png -%%WWWDIR%%/share/userfiles/images/shapes/demo-text_demo.png -%%WWWDIR%%/share/userfiles/images/shapes/demo-text_hoststate.png -%%WWWDIR%%/share/userfiles/images/shapes/demo-text_mapstate.png -%%WWWDIR%%/share/userfiles/images/shapes/demo-text_servicestate.png -%%WWWDIR%%/share/userfiles/images/shapes/demo_german_landscape.png -%%WWWDIR%%/share/userfiles/images/shapes/demo_server_bg.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_warning_ack.png +%%WWWDIR%%/share/userfiles/images/iconsets/std_small_warning_dt.png +%%WWWDIR%%/share/userfiles/images/maps/demo-germany.png +%%WWWDIR%%/share/userfiles/images/maps/demo-ham-racks.png +%%WWWDIR%%/share/userfiles/images/maps/demo-host.png +%%WWWDIR%%/share/userfiles/images/maps/demo-load.png +%%WWWDIR%%/share/userfiles/images/maps/demo-overview.png +%%WWWDIR%%/share/userfiles/images/shapes/demo-wan-cloud.png %%WWWDIR%%/share/userfiles/images/shapes/demo_traffic_load_legend.png +%%WWWDIR%%/share/userfiles/images/shapes/std_dummy.png +%%WWWDIR%%/share/userfiles/images/templates/default.control_delete.gif +%%WWWDIR%%/share/userfiles/images/templates/default.control_drag.gif +%%WWWDIR%%/share/userfiles/images/templates/default.control_modify.gif +%%WWWDIR%%/share/userfiles/images/templates/default.control_togglemid.gif +%%WWWDIR%%/share/userfiles/images/templates/default.folder_closed.gif +%%WWWDIR%%/share/userfiles/images/templates/default.folder_open.gif %%WWWDIR%%/share/userfiles/images/templates/default.header.png %%WWWDIR%%/share/userfiles/images/templates/default.header_down.png +%%WWWDIR%%/share/userfiles/images/templates/default.header_hide.png %%WWWDIR%%/share/userfiles/images/templates/default.header_over.png +%%WWWDIR%%/share/userfiles/images/templates/default.header_show.png +%%WWWDIR%%/share/userfiles/scripts/.gitignore +%%WWWDIR%%/share/userfiles/scripts/std_lq.php %%WWWDIR%%/share/userfiles/sounds/std_critical.mp3 %%WWWDIR%%/share/userfiles/sounds/std_down.mp3 %%WWWDIR%%/share/userfiles/sounds/std_error.mp3 %%WWWDIR%%/share/userfiles/sounds/std_unreachable.mp3 %%WWWDIR%%/share/userfiles/sounds/std_warning.mp3 %%WWWDIR%%/share/userfiles/styles/.gitignore -%%WWWDIR%%/share/userfiles/templates/default.automap.html -%%WWWDIR%%/share/userfiles/templates/default.automapModifyParams.html -%%WWWDIR%%/share/userfiles/templates/default.automapToMap.html %%WWWDIR%%/share/userfiles/templates/default.changePassword.html %%WWWDIR%%/share/userfiles/templates/default.context.css %%WWWDIR%%/share/userfiles/templates/default.context.html @@ -603,18 +645,16 @@ %%WWWDIR%%/share/userfiles/templates/default.multisiteMaps.html %%WWWDIR%%/share/userfiles/templates/default.overview.html %%WWWDIR%%/share/userfiles/templates/default.search.html +%%WWWDIR%%/share/userfiles/templates/default.toStaticMap.html %%WWWDIR%%/share/userfiles/templates/default.url.html %%WWWDIR%%/share/userfiles/templates/default.userMgmt.html %%WWWDIR%%/share/userfiles/templates/default.wuiEditMainCfg.html -%%WWWDIR%%/share/userfiles/templates/default.wuiIndex.html %%WWWDIR%%/share/userfiles/templates/default.wuiManageBackends.html %%WWWDIR%%/share/userfiles/templates/default.wuiManageBackgrounds.html %%WWWDIR%%/share/userfiles/templates/default.wuiManageMaps.html %%WWWDIR%%/share/userfiles/templates/default.wuiManageShapes.html -%%WWWDIR%%/share/userfiles/templates/default.wuiMap.html %%WWWDIR%%/share/userfiles/templates/default.wuiMapAddModify.html %%WWWDIR%%/share/userfiles/templates/default.wuiMapManageTmpl.html -%%WWWDIR%%/share/userfiles/templates/default.wuiWelcome.html %%WWWDIR%%/uifx/README %%WWWDIR%%/uifx/deploy.wscp %%WWWDIR%%/uifx/html-template/AC_OETags.js @@ -732,6 +772,7 @@ @dirrmtry %%WWWDIR%%/share/userfiles/templates @dirrmtry %%WWWDIR%%/share/userfiles/styles @dirrmtry %%WWWDIR%%/share/userfiles/sounds +@dirrmtry %%WWWDIR%%/share/userfiles/scripts @dirrmtry %%WWWDIR%%/share/userfiles/images/templates @dirrmtry %%WWWDIR%%/share/userfiles/images/shapes @dirrmtry %%WWWDIR%%/share/userfiles/images/maps @@ -740,6 +781,8 @@ @dirrmtry %%WWWDIR%%/share/userfiles/images @dirrmtry %%WWWDIR%%/share/userfiles/gadgets @dirrmtry %%WWWDIR%%/share/userfiles +@dirrm %%WWWDIR%%/share/server/core/sources +@dirrm %%WWWDIR%%/share/server/core/mapcfg @dirrm %%WWWDIR%%/share/server/core/functions @dirrm %%WWWDIR%%/share/server/core/ext/php-gettext-1.0.9 @dirrm %%WWWDIR%%/share/server/core/ext @@ -768,12 +811,6 @@ @dirrm %%WWWDIR%%/share/netmap/library/Zend @dirrm %%WWWDIR%%/share/netmap/library @dirrm %%WWWDIR%%/share/netmap -@dirrm %%WWWDIR%%/share/frontend/wui/js -@dirrm %%WWWDIR%%/share/frontend/wui/images -@dirrm %%WWWDIR%%/share/frontend/wui/defines -@dirrm %%WWWDIR%%/share/frontend/wui/css -@dirrm %%WWWDIR%%/share/frontend/wui/classes -@dirrm %%WWWDIR%%/share/frontend/wui @dirrm %%WWWDIR%%/share/frontend/nagvis-js/locale/ru_RU/LC_MESSAGES @dirrm %%WWWDIR%%/share/frontend/nagvis-js/locale/ru_RU @dirrm %%WWWDIR%%/share/frontend/nagvis-js/locale/pt_BR/LC_MESSAGES @@ -788,6 +825,7 @@ @dirrm %%WWWDIR%%/share/frontend/nagvis-js/locale/de_DE @dirrm %%WWWDIR%%/share/frontend/nagvis-js/locale @dirrm %%WWWDIR%%/share/frontend/nagvis-js/js +@dirrm %%WWWDIR%%/share/frontend/nagvis-js/images/jscolor @dirrm %%WWWDIR%%/share/frontend/nagvis-js/images/internal @dirrm %%WWWDIR%%/share/frontend/nagvis-js/images @dirrm %%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/plugins/builtin/processors @@ -816,13 +854,13 @@ @dirrm %%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0 @dirrm %%WWWDIR%%/share/frontend/nagvis-js/ext @dirrm %%WWWDIR%%/share/frontend/nagvis-js/defines -@dirrm %%WWWDIR%%/share/frontend/nagvis-js/css @dirrm %%WWWDIR%%/share/frontend/nagvis-js/classes @dirrm %%WWWDIR%%/share/frontend/nagvis-js @dirrm %%WWWDIR%%/share/frontend @dirrmtry %%WWWDIR%%/share @dirrmtry %%WWWDIR%%/etc/maps @dirrmtry %%WWWDIR%%/etc/geomap +@dirrmtry %%WWWDIR%%/etc/conf.d @dirrmtry %%WWWDIR%%/etc/automaps @dirrmtry %%WWWDIR%%/etc @dirrm %%WWWDIR%%/docs/general/img @@ -834,6 +872,3 @@ @dirrm %%WWWDIR%%/docs/de_DE @dirrm %%WWWDIR%%/docs @dirrmtry %%WWWDIR%% -@exec mkdir -p %D/%%WWWDIR%%/var/tmpl/compile -@exec mkdir -p %D/%%WWWDIR%%/var/tmpl/cache -@exec mkdir -p %D/%%WWWDIR%%/share/var
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210102135.q9ALZbxP006377>