View | Details | Raw Unified | Return to bug 146081
Collapse All | Expand All

(-)b/net-mgmt/nagiosgraph/Makefile (-6 / +7 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	nagiosgraph
8
PORTNAME=	nagiosgraph
9
PORTVERSION=	1.4.1
9
PORTVERSION=	1.4.2
10
PORTREVISION=	1
11
CATEGORIES=	net-mgmt
10
CATEGORIES=	net-mgmt
12
MASTER_SITES=	SF
11
MASTER_SITES=	SF
13
12
Lines 20-30 RUN_DEPENDS= ${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios \ Link Here
20
USE_PERL5_RUN=	yes
19
USE_PERL5_RUN=	yes
21
NO_BUILD=	yes
20
NO_BUILD=	yes
22
21
23
PORTDOCS=	AUTHORS CHANGELOG INSTALL README README.map TODO
22
PORTDOCS=	AUTHORS CHANGELOG INSTALL README TODO
24
NAGIOSWWWDIR?=	www/nagios
23
NAGIOSWWWDIR?=	www/nagios
25
CGIFILES=	show.cgi showgraph.cgi showhost.cgi showservice.cgi testcolor.cgi showgroup.cgi
24
CGIFILES=	show.cgi showgraph.cgi showhost.cgi showservice.cgi testcolor.cgi showgroup.cgi
26
LIBFILES=	insert.pl
25
LIBFILES=	insert.pl
27
CFGFILES=	nagiosgraph.conf servdb.conf groupdb.conf hostdb.conf map
26
CFGFILES=	nagiosgraph.conf nagiosgraph_de.conf nagiosgraph_es.conf nagiosgraph_fr.conf \
27
                servdb.conf groupdb.conf hostdb.conf datasetdb.conf map access.conf labels.conf \
28
		rrdopts.conf
28
29
29
PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR} PORTNAME=${PORTNAME}
30
PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR} PORTNAME=${PORTNAME}
30
31
Lines 59-65 do-install: Link Here
59
	${INSTALL_SCRIPT} ${WRKSRC}/cgi/$i ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/${PORTNAME}/
60
	${INSTALL_SCRIPT} ${WRKSRC}/cgi/$i ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/${PORTNAME}/
60
.endfor
61
.endfor
61
62
62
.for i in share/nagiosgraph.css share/nagiosgraph.js
63
.for i in share/nagiosgraph.css share/nagiosgraph.js share/nagiosgraph.ssi
63
	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${NAGIOSWWWDIR}/stylesheets
64
	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${NAGIOSWWWDIR}/stylesheets
64
.endfor
65
.endfor
65
66
Lines 68-74 do-install: Link Here
68
69
69
.if !defined(NOPORTEXAMPLES)
70
.if !defined(NOPORTEXAMPLES)
70
	${MKDIR} ${EXAMPLESDIR}
71
	${MKDIR} ${EXAMPLESDIR}
71
.for i in utils/authz.pl utils/testentry.pl utils/upgrade.pl
72
.for i in utils/testentry.pl utils/upgrade.pl
72
	${INSTALL_SCRIPT} ${WRKSRC}/$i ${EXAMPLESDIR}/
73
	${INSTALL_SCRIPT} ${WRKSRC}/$i ${EXAMPLESDIR}/
73
.endfor
74
.endfor
74
.endif
75
.endif
(-)b/net-mgmt/nagiosgraph/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (nagiosgraph-1.4.1.tar.gz) = 4b9d7d81d1e6f3c1cabc2a76c6d8fd3e
1
MD5 (nagiosgraph-1.4.2.tar.gz) = 085c01c1f2534d050b21815af1986282
2
SHA256 (nagiosgraph-1.4.1.tar.gz) = 078ec882758e3a56fb2705494e72f38ca9232658d1e7c3d7c3c7afd1f66c6b49
2
SHA256 (nagiosgraph-1.4.2.tar.gz) = 798509946bbfc0d4f63fbf0d988dde4a40dcea9c5f935ee9c1ebd27158dff210
3
SIZE (nagiosgraph-1.4.1.tar.gz) = 79340
3
SIZE (nagiosgraph-1.4.2.tar.gz) = 108561
(-)b/net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in (-27 / +45 lines)
Lines 1-54 Link Here
1
--- etc/nagiosgraph.conf.orig	2010-03-05 10:24:25.000000000 +0000
1
--- etc/nagiosgraph.conf.orig	2010-04-27 08:14:25.000000000 +0000
2
+++ etc/nagiosgraph.conf	2010-03-05 10:44:53.000000000 +0000
2
+++ etc/nagiosgraph.conf	2010-04-27 08:18:16.000000000 +0000
3
@@ -8,41 +8,41 @@
3
@@ -8,19 +8,19 @@
4
 # Author:  (c) 2010 Matthew Wall
4
 # Author:  (c) 2010 Matthew Wall
5
 
5
 
6
 # Location of nagiosgraph log file.  Debug output ends up here.
6
 # Location of nagiosgraph log file.  Debug output ends up here.
7
-logfile = /var/log/nagiosgraph.log
7
-logfile = /var/log/nagiosgraph.log
8
+logfile = /var/spool/nagios/nagiosgraph.log
8
+logfile = /var/spool/nagios/nagiosgraph.log
9
 
9
 
10
 # Optionally keep logging from CGI scripts in a separate file.
11
 #cgilogfile = /var/log/nagiosgraph-cgi.log
12
 
10
 # Location of nagios performance data log file. Comment out if not used.
13
 # Location of nagios performance data log file. Comment out if not used.
11
-perflog = /var/nagios/perfdata.log
14
-perflog = /var/nagios/perfdata.log
12
+perflog = /var/spool/nagios/perfdata.log
15
+perflog = /var/spool/nagios/perfdata.log
13
 
16
 
14
 # Directory to store rrd database files
17
 # Directory to store rrd database files
15
-rrddir = /var/nagiosgraph/rrd
18
 rrddir = /var/nagiosgraph/rrd
16
+rrddir = /var/spool/nagios/rrd
17
 
19
 
18
 # File containing regular expressions to identify service and perf data
20
 # File containing regular expressions to identify service and perf data
19
-mapfile = /etc/nagiosgraph/map
21
-mapfile = /etc/nagiosgraph/map
20
+mapfile = %%PREFIX%%/etc/nagios/nagiosgraph/map
22
+mapfile = %%PREFIX%%/etc/nagios/nagiosgraph/map
21
 
23
 
22
 # Location of showhost control file
23
-hostdb = /etc/nagiosgraph/hostdb.conf
24
+hostdb = %%PREFIX%%/etc/nagios/nagiosgraph/hostdb.conf
25
 
26
 # Location of showservice control file
27
-servdb = /etc/nagiosgraph/servdb.conf
28
+servdb = %%PREFIX%%/etc/nagios/nagiosgraph/servdb.conf
29
 
30
 # Location of showgroup control file
31
-groupdb = /etc/nagiosgraph/groupdb.conf
32
+groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf
33
 
34
 # File containing data sets that should be selected in service queries.
35
 #datasetdb = /opt/nagiosgraph/etc/datasetdb.conf
36
 
37
 # Nagiosgraph CGI URL.
24
 # Nagiosgraph CGI URL.
38
-nagiosgraphcgiurl = /nagiosgraph/cgi-bin
25
 nagiosgraphcgiurl = /nagiosgraph/cgi-bin
39
+nagiosgraphcgiurl = /nagios/cgi-bin/nagiosgraph
26
@@ -30,36 +30,36 @@
40
 
41
 # Nagios CGI URL.  If the Nagiosgraph CGI scripts are in a directory other
42
 # than the Nagios CGI directory, then specify the Nagios CGI URL here.
43
 #nagioscgiurl = /nagios/cgi-bin
27
 #nagioscgiurl = /nagios/cgi-bin
44
 
28
 
45
 # JavaScript: URL to the nagiosgraph javascript file.
29
 # JavaScript: URL to the nagiosgraph javascript file.
46
-javascript = /nagiosgraph/nagiosgraph.js
30
-javascript = /nagiosgraph/nagiosgraph.js
47
+javascript = /nagios/stylesheets/nagiosgraph.js
31
+javascript = /nagios/stylesheets/nagiosgraph.js
48
 
32
 
49
 # Stylesheet: URL to the nagiosgraph stylesheet.  Comment out if not used.
33
 # Stylesheet: URL to the nagiosgraph stylesheet.
50
-stylesheet = /nagiosgraph/nagiosgraph.css
34
-stylesheet = /nagiosgraph/nagiosgraph.css
51
+stylesheet = /nagios/stylesheets/nagiosgraph.css
35
+stylesheet = /nagios/stylesheets/nagiosgraph.css
52
 
36
 
37
 # File containing labels for services and data (optional)
38
-#labelfile = /etc/nagiosgraph/labels.conf
39
+#labelfile = %%PREFIX%%/etc/nagios/nagiosgraph/labels.conf
40
 
41
 # Location of showhost control file (optional)
42
-#hostdb = /etc/nagiosgraph/hostdb.conf
43
+#hostdb = %%PREFIX%%/etc/nagios/nagiosgraph/hostdb.conf
44
 
45
 # Location of showservice control file (optional)
46
-#servdb = /etc/nagiosgraph/servdb.conf
47
+#servdb = %%PREFIX%%/etc/nagios/nagiosgraph/servdb.conf
48
 
49
 # Location of showgroup control file (required for showgroup.cgi)
50
-groupdb = /etc/nagiosgraph/groupdb.conf
51
+groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf
52
 
53
 # File containing data sets that should be selected in queries (optional)
54
-#datasetdb = /etc/nagiosgraph/datasetdb.conf
55
+#datasetdb = %%PREFIX%%/etc/nagios/nagiosgraph/datasetdb.conf
56
 
57
 # Access control configuration (optional)
58
 # The authorization method can be one of nagios3 or nagiosgraph.  If no
59
 # method is defined, access will be granted to all hosts and services.
60
 # For access control via nagios, specify the nagios configuration files.
61
 #authzmethod = nagios3
62
-#authznagios_cfg = /etc/nagios/nagios.cfg
63
-#authzcgi_cfg = /etc/nagios/cgi.cfg
64
+#authznagios_cfg = %%PREFIX%%/etc/nagios/nagios.cfg
65
+#authzcgi_cfg = %%PREFIX%%/etc/nagios/cgi.cfg
66
 # For access control via nagiosgraph, specify a single access control file.
67
 #authzmethod = nagiosgraph
68
-#authzfile = /etc/nagiosgraph/access.conf
69
+#authzfile = %%PREFIX%%/etc/nagios/nagiosgraph/access.conf
70
 
53
 
71
 
54
 # Debug can be enabled for a specific CGI script and/or specific hosts or
72
 # Logging can be enabled for a specific CGI script and/or specific hosts or
(-)b/net-mgmt/nagiosgraph/pkg-plist (-1 / +22 lines)
Lines 10-19 etc/nagios/%%PORTNAME%%/map.sample Link Here
10
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf; fi
10
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf; fi
11
etc/nagios/%%PORTNAME%%/nagiosgraph.conf.sample
11
etc/nagios/%%PORTNAME%%/nagiosgraph.conf.sample
12
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf ] ; then cp -p %D/%F %B/nagiosgraph.conf; fi
12
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph.conf ] ; then cp -p %D/%F %B/nagiosgraph.conf; fi
13
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf; fi
14
etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf.sample
15
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_de.conf ] ; then cp -p %D/%F %B/nagiosgraph_de.conf; fi
16
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf; fi
17
etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf.sample
18
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_es.conf ] ; then cp -p %D/%F %B/nagiosgraph_es.conf; fi
19
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf.sample %D/etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf; fi
20
etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf.sample
21
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/nagiosgraph_fr.conf ] ; then cp -p %D/%F %B/nagiosgraph_fr.conf; fi
13
etc/nagios/%%PORTNAME%%/ngshared.pm
22
etc/nagios/%%PORTNAME%%/ngshared.pm
14
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/servdb.conf.sample %D/etc/nagios/%%PORTNAME%%/servdb.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/servdb.conf; fi
23
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/servdb.conf.sample %D/etc/nagios/%%PORTNAME%%/servdb.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/servdb.conf; fi
15
etc/nagios/%%PORTNAME%%/servdb.conf.sample
24
etc/nagios/%%PORTNAME%%/servdb.conf.sample
16
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/servdb.conf ] ; then cp -p %D/%F %B/servdb.conf; fi
25
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/servdb.conf ] ; then cp -p %D/%F %B/servdb.conf; fi
26
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/datasetdb.conf.sample %D/etc/nagios/%%PORTNAME%%/datasetdb.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/datasetdb.conf; fi
27
etc/nagios/%%PORTNAME%%/datasetdb.conf.sample
28
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/datasetdb.conf ] ; then cp -p %D/%F %B/datasetdb.conf; fi
29
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/access.conf.sample %D/etc/nagios/%%PORTNAME%%/access.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/access.conf; fi
30
etc/nagios/%%PORTNAME%%/access.conf.sample
31
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/access.conf ] ; then cp -p %D/%F %B/access.conf; fi
32
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/labels.conf.sample %D/etc/nagios/%%PORTNAME%%/labels.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/labels.conf; fi
33
etc/nagios/%%PORTNAME%%/labels.conf.sample
34
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/labels.conf ] ; then cp -p %D/%F %B/labels.conf; fi
35
@unexec if cmp -s %D/etc/nagios/%%PORTNAME%%/rrdopts.conf.sample %D/etc/nagios/%%PORTNAME%%/rrdopts.conf; then rm -f %D/etc/nagios/%%PORTNAME%%/rrdopts.conf; fi
36
etc/nagios/%%PORTNAME%%/rrdopts.conf.sample
37
@exec if [ ! -f %D/etc/nagios/%%PORTNAME%%/rrdopts.conf ] ; then cp -p %D/%F %B/rrdopts.conf; fi
17
libexec/%%PORTNAME%%/insert.pl
38
libexec/%%PORTNAME%%/insert.pl
18
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/show.cgi
39
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/show.cgi
19
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgraph.cgi
40
%%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgraph.cgi
Lines 26-32 libexec/%%PORTNAME%%/insert.pl Link Here
26
@unexec mv %D/%%NAGIOSWWWDIR%%%/images/action.gif.bak %D/%%NAGIOSWWWDIR%%/images/action.gif
47
@unexec mv %D/%%NAGIOSWWWDIR%%%/images/action.gif.bak %D/%%NAGIOSWWWDIR%%/images/action.gif
27
%%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.css
48
%%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.css
28
%%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.js
49
%%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.js
29
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/authz.pl
50
%%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.ssi
30
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testentry.pl
51
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testentry.pl
31
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade.pl
52
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade.pl
32
@dirrm libexec/%%PORTNAME%%
53
@dirrm libexec/%%PORTNAME%%

Return to bug 146081