sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 1.4.4.

Browse source 
PR:		154507
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru>
Approved by:	maintainer
Feature safe:	yes
This commit is contained in:
Martin Wilke 2011-02-05 10:59:19 +00:00
parent 8401bd6734
commit bbaba9dd4d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=268668
4 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net-mgmt/nagiosgraph/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= nagiosgraph PORTNAME= nagiosgraph
PORTVERSION= 1.4.3 PORTVERSION= 1.4.4
CATEGORIES= net-mgmt CATEGORIES= net-mgmt
MASTER_SITES= SF MASTER_SITES= SF
@ -21,7 +21,8 @@ NO_BUILD= yes
PORTDOCS= AUTHORS CHANGELOG INSTALL README TODO PORTDOCS= AUTHORS CHANGELOG INSTALL README TODO
NAGIOSWWWDIR?= www/nagios NAGIOSWWWDIR?= www/nagios
CGIFILES= show.cgi showgraph.cgi showhost.cgi showservice.cgi testcolor.cgi showgroup.cgi CGIFILES= show.cgi showconfig.cgi showgraph.cgi showgroup.cgi showhost.cgi \
showservice.cgi testcolor.cgi
LIBFILES= insert.pl LIBFILES= insert.pl
CFGFILES= nagiosgraph.conf nagiosgraph_de.conf nagiosgraph_es.conf nagiosgraph_fr.conf \ CFGFILES= nagiosgraph.conf nagiosgraph_de.conf nagiosgraph_es.conf nagiosgraph_fr.conf \
servdb.conf groupdb.conf hostdb.conf datasetdb.conf map access.conf labels.conf \ servdb.conf groupdb.conf hostdb.conf datasetdb.conf map access.conf labels.conf \
@ -68,7 +69,7 @@ do-install:
.endfor .endfor
${MV} ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif.bak ${MV} ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif.bak
${INSTALL_DATA} ${WRKSRC}/share/action.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif ${INSTALL_DATA} ${WRKSRC}/share/graph.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif
.if !defined(NOPORTEXAMPLES) .if !defined(NOPORTEXAMPLES)
${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${EXAMPLESDIR}

5
net-mgmt/nagiosgraph/distinfo
View file

@ -1,3 +1,2 @@
MD5 (nagiosgraph-1.4.3.tar.gz) = e00ac92d9d51a7605e08617d19b64080 SHA256 (nagiosgraph-1.4.4.tar.gz) = e6c7091fbbf7dc44a5a3e8584d3f85dfbf20171dcb253c744ac15300cc9804a1
SHA256 (nagiosgraph-1.4.3.tar.gz) = f5c75abc782020d150c99417316dc838b640480be6b481cdd791b528954cd74f SIZE (nagiosgraph-1.4.4.tar.gz) = 157955
SIZE (nagiosgraph-1.4.3.tar.gz) = 113534

37
net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in
View file

@ -1,20 +1,20 @@
--- ./etc/nagiosgraph.conf.orig 2010-06-07 18:30:21.000000000 +0200 --- ./etc/nagiosgraph.conf.orig 2011-01-15 09:27:44.000000000 +0300
+++ ./etc/nagiosgraph.conf 2010-08-17 21:50:26.000000000 +0200 +++ ./etc/nagiosgraph.conf 2011-02-03 16:08:34.000000000 +0300
@@ -8,19 +8,19 @@ @@ -8,19 +8,19 @@
# Author: (c) 2010 Matthew Wall # Author: (c) 2010 Matthew Wall
# Location of nagiosgraph log file. Debug output ends up here. # Location of output from nagiosgraph data processing
-logfile = /var/log/nagiosgraph.log -logfile = /var/nagiosgraph/nagiosgraph.log
+logfile = /var/spool/nagios/nagiosgraph.log +logfile = /var/spool/nagios/nagiosgraph.log
# Optionally keep logging from CGI scripts in a separate file. # Location of output from nagiosgraph CGI scripts
#cgilogfile = /var/log/nagiosgraph-cgi.log cgilogfile = /var/nagiosgraph/nagiosgraph-cgi.log
# Location of nagios performance data log file. Comment out if not used. # Location of nagios performance data log file.
-perflog = /var/nagios/perfdata.log -perflog = /var/nagios/perfdata.log
+perflog = /var/spool/nagios/perfdata.log +perflog = /var/spool/nagios/perfdata.log
# Directory to store rrd database files # Directory in which to store RRD files
-rrddir = /var/nagiosgraph/rrd -rrddir = /var/nagiosgraph/rrd
+rrddir = /var/spool/nagios/nagiosgraph/rrd +rrddir = /var/spool/nagios/nagiosgraph/rrd
@ -24,12 +24,8 @@
# Nagiosgraph CGI URL. # Nagiosgraph CGI URL.
nagiosgraphcgiurl = /nagiosgraph/cgi-bin nagiosgraphcgiurl = /nagiosgraph/cgi-bin
@@ -30,36 +30,36 @@ @@ -33,22 +33,22 @@
#nagioscgiurl = /nagios/cgi-bin javascript = /nagiosgraph/nagiosgraph.js
# JavaScript: URL to the nagiosgraph javascript file.
-javascript = /nagiosgraph/nagiosgraph.js
+javascript = /nagios/stylesheets/nagiosgraph.js
# Stylesheet: URL to the nagiosgraph stylesheet. # Stylesheet: URL to the nagiosgraph stylesheet.
-stylesheet = /nagiosgraph/nagiosgraph.css -stylesheet = /nagiosgraph/nagiosgraph.css
@ -57,14 +53,15 @@
# Access control configuration (optional) # Access control configuration (optional)
# The authorization method can be one of nagios3 or nagiosgraph. If no # The authorization method can be one of nagios3 or nagiosgraph. If no
# method is defined, access will be granted to all hosts and services. @@ -61,12 +61,12 @@
# For access control via nagios, specify the nagios configuration files. # authorized_for_all_hosts, authorized_for_all_services, and default_user_name
# variables to determine permissions.
#authzmethod = nagios3 #authzmethod = nagios3
-#authznagios_cfg = /etc/nagios/nagios.cfg -#authzfile = /etc/nagios/cgi.cfg
-#authzcgi_cfg = /etc/nagios/cgi.cfg +#authzfile = %%PREFIX%%/etc/nagios/cgi.cfg
+#authznagios_cfg = %%PREFIX%%/etc/nagios/nagios.cfg
+#authzcgi_cfg = %%PREFIX%%/etc/nagios/cgi.cfg
# For access control via nagiosgraph, specify a single access control file. # For access control via nagiosgraph, specify a single access control file.
# See the sample access control file for syntax and examples.
#authzmethod = nagiosgraph #authzmethod = nagiosgraph
-#authzfile = /etc/nagiosgraph/access.conf -#authzfile = /etc/nagiosgraph/access.conf
+#authzfile = %%PREFIX%%/etc/nagios/nagiosgraph/access.conf +#authzfile = %%PREFIX%%/etc/nagios/nagiosgraph/access.conf

1
net-mgmt/nagiosgraph/pkg-plist
View file

@ -37,6 +37,7 @@ etc/nagios/%%PORTNAME%%/rrdopts.conf.sample
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/rrdopts.conf ] ; then cp -p %D/%F %B/rrdopts.conf; fi @exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/rrdopts.conf ] ; then cp -p %D/%F %B/rrdopts.conf; fi
libexec/%%PORTNAME%%/insert.pl libexec/%%PORTNAME%%/insert.pl
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/show.cgi %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/show.cgi
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showconfig.cgi
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgraph.cgi %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgraph.cgi
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgroup.cgi %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgroup.cgi
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showhost.cgi %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showhost.cgi