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

(-)b/net-mgmt/nagios/Makefile (-4 / +6 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	nagios
8
PORTNAME=	nagios
9
PORTVERSION=	3.0.6
9
PORTVERSION=	3.1.2
10
PORTREVISION=	1
11
CATEGORIES=	net-mgmt
10
CATEGORIES=	net-mgmt
12
MASTER_SITES=	SF
11
MASTER_SITES=	SF
13
12
Lines 21-26 USE_ICONV= yes Link Here
21
USE_PERL5_BUILD=	yes
20
USE_PERL5_BUILD=	yes
22
USE_AUTOTOOLS=	autoconf:262 libltdl:15
21
USE_AUTOTOOLS=	autoconf:262 libltdl:15
23
USE_RC_SUBR=	nagios
22
USE_RC_SUBR=	nagios
23
USE_PHP=	yes
24
24
25
CONFLICTS=	nagios-[12].* nagios-devel-*
25
CONFLICTS=	nagios-[12].* nagios-devel-*
26
26
Lines 55-61 CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ Link Here
55
		--with-cgiurl=${NAGIOSCGIURL} \
55
		--with-cgiurl=${NAGIOSCGIURL} \
56
		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
56
		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
57
		--libexecdir=${PREFIX}/libexec/nagios \
57
		--libexecdir=${PREFIX}/libexec/nagios \
58
		--datadir=${PREFIX}/${NAGIOSWWWDIR} \
58
		--datarootdir=${PREFIX}/${NAGIOSWWWDIR} \
59
		--docdir=${PREFIX}/${NAGIOSWWWDIR} \
59
		--sysconfdir=${PREFIX}/etc/nagios \
60
		--sysconfdir=${PREFIX}/etc/nagios \
60
		--localstatedir=${NAGIOSDIR} \
61
		--localstatedir=${NAGIOSDIR} \
61
		--with-httpd-conf=${PREFIX}/etc \
62
		--with-httpd-conf=${PREFIX}/etc \
Lines 79-85 PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ Link Here
79
		NAGIOSGID=${NAGIOSGID} \
80
		NAGIOSGID=${NAGIOSGID} \
80
		NAGIOSHTMURL=${NAGIOSHTMURL} \
81
		NAGIOSHTMURL=${NAGIOSHTMURL} \
81
		NAGIOSCGIURL=${NAGIOSCGIURL} \
82
		NAGIOSCGIURL=${NAGIOSCGIURL} \
82
		WWWGRP=${WWWGRP}
83
		WWWGRP=${WWWGRP} \
84
		CONFIG_INC=${PREFIX}/${NAGIOSWWWDIR}/config.inc.php
83
85
84
SUB_FILES=	pkg-install \
86
SUB_FILES=	pkg-install \
85
		pkg-deinstall \
87
		pkg-deinstall \
(-)b/net-mgmt/nagios/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (nagios-3.0.6.tar.gz) = 900e3f4164f4b2a18485420eeaefe812
1
MD5 (nagios-3.1.2.tar.gz) = f3c60428cba14264c709749182b8d93e
2
SHA256 (nagios-3.0.6.tar.gz) = bedeb2c1ffbf7525ec19ac84a66bad60a19d2b0544cbf050a53bfc363c09bb22
2
SHA256 (nagios-3.1.2.tar.gz) = 216800ea2ad1f8b1adccc2dccfa6bbdf63223ffe5109d18bea71ffb9a126b846
3
SIZE (nagios-3.0.6.tar.gz) = 2735504
3
SIZE (nagios-3.1.2.tar.gz) = 3172982
(-)b/net-mgmt/nagios/files/patch-base-utils.c (-35 / +16 lines)
Lines 1-38 Link Here
1
--- base/utils.c.orig	2008-12-01 03:52:58.000000000 +1030
1
--- base/utils.c.orig	2009-07-05 10:04:01.000000000 +0400
2
+++ base/utils.c	2009-05-03 11:51:19.000000000 +0930
2
+++ base/utils.c	2009-07-05 10:05:36.000000000 +0400
3
@@ -3597,7 +3597,7 @@
3
@@ -3691,7 +3691,16 @@
4
 /* initializes embedded perl interpreter */
4
 		if(embedding==NULL)
5
 int init_embedded_perl(char **env){
5
 			return ERROR;
6
 #ifdef EMBEDDEDPERL
6
 		*embedding=strdup("");
7
-	char *embedding[]={ "", "" };
7
+		if(*embedding==NULL){
8
+	char **embedding = NULL;
8
+			free(embedding);
9
 	int exitstatus=0;
9
+			return ERROR;
10
 	char *temp_buffer=NULL;
10
+		}
11
 	int argc=2;
11
 		*(embedding+1)=strdup(p1_file);
12
@@ -3613,6 +3613,17 @@
12
+		if(*(embedding+1)==NULL){
13
 
13
+			free(*embedding);
14
 	else{
14
+			free(embedding);
15
 
15
+			return ERROR;
16
+	  embedding = malloc(argc * sizeof(char *));
16
+		}
17
+	  if (embedding == NULL) {
18
+	    use_embedded_perl = FALSE;
19
+	    logit(NSLOG_RUNTIME_ERROR, TRUE, "Error: Unable to allocate memory for embedded Perl interpreter! (see ports/131993)\n");
20
+	  } else {
21
+	    embedding[0] = malloc(sizeof(char));
22
+	    if (embedding[0] == NULL) {
23
+	      use_embedded_perl = FALSE;
24
+	      logit(NSLOG_RUNTIME_ERROR, TRUE, "Error: Unable to allocate memory for embedded Perl interpreter! (see ports/131993)\n");
25
+	    } else {
26
+		*embedding[0] = '\0';
27
 		embedding[1]=p1_file;
28
 
17
 
29
 		use_embedded_perl=TRUE;
18
 		use_embedded_perl=TRUE;
30
@@ -3624,6 +3635,8 @@
31
 			logit(NSLOG_RUNTIME_ERROR,TRUE,"Error: Could not allocate memory for embedded Perl interpreter!\n");
32
 			}
33
 		}
34
+	    }
35
+	  }
36
 
19
 
37
 	/* a fatal error occurred... */
38
 	if(use_embedded_perl==FALSE){
(-)b/net-mgmt/nagios/files/patch-configure.in (-12 lines)
Lines 41-58 Link Here
41
 AC_SUBST(INSTALL_OPTS)
41
 AC_SUBST(INSTALL_OPTS)
42
 
42
 
43
 AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
43
 AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
44
@@ -520,9 +528,9 @@
45
 fi
46
 
47
 dnl Try and locate glib
48
-GLIB_INCLUDE=`pkg-config --cflags glib-2.0`
49
+GLIB_INCLUDE=""
50
 AC_SUBST(GLIB_INCLUDE)
51
-GLIB_LIBS=`pkg-config --libs glib-2.0`
52
+GLIB_LIBS=""
53
 AC_SUBST(GLIB_LIBS)
54
 if test x$GLIB_LIBS != x; then
55
 	AC_DEFINE_UNQUOTED(HAVE_GLIB)
56
@@ -667,6 +675,9 @@
44
@@ -667,6 +675,9 @@
57
 
45
 
58
 	AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
46
 	AC_DEFINE_UNQUOTED(EMBEDDEDPERL)
(-)b/net-mgmt/nagios/files/patch-html-Makefile.in (-26 / +49 lines)
Lines 1-6 Link Here
1
--- html/Makefile.in.orig	2008-11-03 04:02:03.000000000 +1030
1
--- html/Makefile.in.orig	2009-06-17 07:57:21.000000000 +0400
2
+++ html/Makefile.in	2008-11-05 15:11:08.000000000 +1030
2
+++ html/Makefile.in	2009-07-05 14:18:47.000000000 +0400
3
@@ -33,39 +33,39 @@
3
@@ -15,6 +15,9 @@
4
 
5
 CP=@CP@
6
 
7
+DIRMODE=755
8
+FILEMODE=644
9
+
10
 all html:
11
 
12
 clean:
13
@@ -33,46 +36,49 @@
4
 devclean: distclean
14
 devclean: distclean
5
 
15
 
6
 install:
16
 install:
Lines 12-64 Link Here
12
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
22
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
13
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
23
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
14
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
24
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
25
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
15
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
26
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
16
-	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
27
-	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
17
-	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
28
-	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
18
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
29
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
19
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
30
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
20
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
31
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
21
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
32
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
22
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
33
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
23
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
34
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
24
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
35
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
25
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
36
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
26
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
37
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
27
+	$(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
38
+	$(INSTALL) -m ${DIRMODE} $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
28
+	$(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
39
+	$(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
29
 	for file in *.html; \
40
+	$(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
41
 # Remove old HTML files (PHP files are used now)
42
 	rm -f $(DESTDIR)$(HTMLDIR)/index.html
43
 	rm -f $(DESTDIR)$(HTMLDIR)/main.html
44
 	rm -f $(DESTDIR)$(HTMLDIR)/side.html
45
-	for file in *.php; \
30
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
46
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
31
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
47
+	for file in *.php; do \
48
+	if [ "$$file" = config.inc.php ]; \
49
+	then $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/config.inc.php.dist; \
50
+	else $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); \
51
+	fi; done
32
 #	for file in media/*.wav; \
52
 #	for file in media/*.wav; \
33
-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
53
-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
34
+#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
54
+#	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
35
 	for file in stylesheets/*.css; \
55
 	for file in stylesheets/*.css; \
36
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
56
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
37
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
57
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
38
 	for file in contexthelp/*.html; \
58
 	for file in contexthelp/*.html; \
39
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
59
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
40
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
60
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
41
 	for file in docs/*.html; \
61
 	for file in docs/*.html; \
42
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
62
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
43
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
63
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
44
 	for file in docs/images/*.*; \
64
 	for file in docs/images/*.*; \
45
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
65
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
46
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
66
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
47
 	for file in images/*.gif; \
67
 	for file in images/*.gif; \
48
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
68
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
49
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
69
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
50
 	for file in images/*.jpg; \
70
 	for file in images/*.jpg; \
51
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
71
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
52
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
72
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
53
 	for file in images/*.png; \
73
 	for file in images/*.png; \
54
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
74
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
55
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
75
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
56
 	for file in images/*.ico; \
76
 	for file in images/*.ico; \
57
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
77
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
58
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
78
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
59
 	for file in images/logos/*.*; \
79
 	for file in images/logos/*.*; \
60
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
80
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
61
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
81
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
82
 	for file in includes/*.*; \
83
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
84
+	do $(INSTALL) -m ${FILEMODE} $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
62
 
85
 
63
 install-unstripped:
86
 install-unstripped:
64
 	$(MAKE) install
87
 	$(MAKE) install
(-)b/net-mgmt/nagios/files/patch-html-docs-configcgi.html (-11 / +11 lines)
Lines 1-11 Link Here
1
--- html/docs/configcgi.html.orig	2008-11-08 17:49:55.000000000 +0100
1
--- html/docs/configcgi.html.orig	2009-06-17 19:13:52.000000000 +0400
2
+++ html/docs/configcgi.html	2008-11-08 17:50:33.000000000 +0100
2
+++ html/docs/configcgi.html	2009-07-05 10:55:03.000000000 +0400
3
@@ -616,7 +616,7 @@
3
@@ -1250,7 +1250,7 @@
4
 </tr>
4
 
5
 <tr>
5
 <td valign=top>Example:</td>
6
 <td valign=top>Example:</td>
6
 
7
-<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
7
-<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
8
+<td><font color="red"><strong>ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$</strong></font></td>
8
+<td><font color="red"><strong>ping_syntax=/sbin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
9
 </tr>
9
 
10
 </table>
10
 </tr>
11
 
11
 
(-)b/net-mgmt/nagios/files/pkg-message.in (+14 lines)
Lines 18-23 Link Here
18
     Order deny,allow
18
     Order deny,allow
19
     Deny from all
19
     Deny from all
20
     Allow from 127.0.0.1
20
     Allow from 127.0.0.1
21
     DirectoryIndex index.php
21
   </Directory>
22
   </Directory>
22
23
23
   <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
24
   <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
Lines 27-30 Link Here
27
   ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
28
   ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
28
   Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/
29
   Alias %%NAGIOSHTMURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/
29
30
31
32
NOTE FOR UPGRADES FROM 3.0.x AND OLDER VERSIONS
33
===============================================
34
35
Nagios now uses PHP for its main Web-interface files.  So, you must
36
enable PHP in the configuration of your Web server and create frontend
37
configuration file %%CONFIG_INC%%.
38
39
Usually it is sufficient to use the contents of
40
  %%CONFIG_INC%%.dist
41
but in case of non-standard configuration you may want to modify the
42
default template before using it.
43
30
**********************************************************************
44
**********************************************************************
(-)b/net-mgmt/nagios/pkg-plist (-5 / +9 lines)
Lines 192-197 etc/nagios/resource.cfg-sample Link Here
192
%%NAGIOSWWWDIR%%/docs/images/multiple-templates1.png
192
%%NAGIOSWWWDIR%%/docs/images/multiple-templates1.png
193
%%NAGIOSWWWDIR%%/docs/images/multiple-templates2.png
193
%%NAGIOSWWWDIR%%/docs/images/multiple-templates2.png
194
%%NAGIOSWWWDIR%%/docs/images/nagios.jpg
194
%%NAGIOSWWWDIR%%/docs/images/nagios.jpg
195
%%NAGIOSWWWDIR%%/docs/images/nagiosexchange.png
196
%%NAGIOSWWWDIR%%/docs/images/nagiossupport.png
195
%%NAGIOSWWWDIR%%/docs/images/ndoutils.png
197
%%NAGIOSWWWDIR%%/docs/images/ndoutils.png
196
%%NAGIOSWWWDIR%%/docs/images/network-outage1.png
198
%%NAGIOSWWWDIR%%/docs/images/network-outage1.png
197
%%NAGIOSWWWDIR%%/docs/images/network-outage2.png
199
%%NAGIOSWWWDIR%%/docs/images/network-outage2.png
Lines 319-325 etc/nagios/resource.cfg-sample Link Here
319
%%NAGIOSWWWDIR%%/images/redundancy.png
321
%%NAGIOSWWWDIR%%/images/redundancy.png
320
%%NAGIOSWWWDIR%%/images/restart.gif
322
%%NAGIOSWWWDIR%%/images/restart.gif
321
%%NAGIOSWWWDIR%%/images/right.gif
323
%%NAGIOSWWWDIR%%/images/right.gif
322
%%NAGIOSWWWDIR%%/images/sblogo.jpg
324
%%NAGIOSWWWDIR%%/images/sblogo.png
323
%%NAGIOSWWWDIR%%/images/serviceevent.gif
325
%%NAGIOSWWWDIR%%/images/serviceevent.gif
324
%%NAGIOSWWWDIR%%/images/splunk1.gif
326
%%NAGIOSWWWDIR%%/images/splunk1.gif
325
%%NAGIOSWWWDIR%%/images/splunk2.gif
327
%%NAGIOSWWWDIR%%/images/splunk2.gif
Lines 345-354 etc/nagios/resource.cfg-sample Link Here
345
%%NAGIOSWWWDIR%%/images/weblogo1.png
347
%%NAGIOSWWWDIR%%/images/weblogo1.png
346
%%NAGIOSWWWDIR%%/images/zoom1.gif
348
%%NAGIOSWWWDIR%%/images/zoom1.gif
347
%%NAGIOSWWWDIR%%/images/zoom2.gif
349
%%NAGIOSWWWDIR%%/images/zoom2.gif
348
%%NAGIOSWWWDIR%%/index.html
350
%%NAGIOSWWWDIR%%/includes/utils.inc.php
349
%%NAGIOSWWWDIR%%/main.html
351
%%NAGIOSWWWDIR%%/config.inc.php.dist
352
%%NAGIOSWWWDIR%%/index.php
353
%%NAGIOSWWWDIR%%/main.php
350
%%NAGIOSWWWDIR%%/robots.txt
354
%%NAGIOSWWWDIR%%/robots.txt
351
%%NAGIOSWWWDIR%%/side.html
355
%%NAGIOSWWWDIR%%/side.php
352
%%NAGIOSWWWDIR%%/stylesheets/avail.css
356
%%NAGIOSWWWDIR%%/stylesheets/avail.css
353
%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
357
%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
354
%%NAGIOSWWWDIR%%/stylesheets/cmd.css
358
%%NAGIOSWWWDIR%%/stylesheets/cmd.css
Lines 374-379 etc/nagios/resource.cfg-sample Link Here
374
@dirrm %%NAGIOSWWWDIR%%/docs
378
@dirrm %%NAGIOSWWWDIR%%/docs
375
@dirrm %%NAGIOSWWWDIR%%/images/logos
379
@dirrm %%NAGIOSWWWDIR%%/images/logos
376
@dirrm %%NAGIOSWWWDIR%%/images
380
@dirrm %%NAGIOSWWWDIR%%/images
381
@dirrm %%NAGIOSWWWDIR%%/includes
377
@dirrm %%NAGIOSWWWDIR%%/media
382
@dirrm %%NAGIOSWWWDIR%%/media
378
@dirrm %%NAGIOSWWWDIR%%/ssi
383
@dirrm %%NAGIOSWWWDIR%%/ssi
379
@dirrm %%NAGIOSWWWDIR%%/stylesheets
384
@dirrm %%NAGIOSWWWDIR%%/stylesheets
380
- 

Return to bug 136187