Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Jul 2015 13:40:08 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r393243 - in branches/2015Q3/sysutils/ganglia-webfrontend: . files
Message-ID:  <201507301340.t6UDe8RQ045993@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Thu Jul 30 13:40:07 2015
New Revision: 393243
URL: https://svnweb.freebsd.org/changeset/ports/393243

Log:
  MFH: r393088
  
  Fix file permissions so WWWDIR is not writable by WWWOWN
  Improve pkg-message notes on setting up Apache and Nginx
  
  PR:	201908
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2015Q3/sysutils/ganglia-webfrontend/Makefile
  branches/2015Q3/sysutils/ganglia-webfrontend/files/pkg-message.in
  branches/2015Q3/sysutils/ganglia-webfrontend/pkg-plist
Directory Properties:
  branches/2015Q3/   (props changed)

Modified: branches/2015Q3/sysutils/ganglia-webfrontend/Makefile
==============================================================================
--- branches/2015Q3/sysutils/ganglia-webfrontend/Makefile	Thu Jul 30 13:27:34 2015	(r393242)
+++ branches/2015Q3/sysutils/ganglia-webfrontend/Makefile	Thu Jul 30 13:40:07 2015	(r393243)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ganglia
 PORTVERSION=	3.7.0
+PORTREVISION=	1
 CATEGORIES=	sysutils net parallel www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-web/${PORTVERSION}
 PKGNAMESUFFIX=	-webfrontend

Modified: branches/2015Q3/sysutils/ganglia-webfrontend/files/pkg-message.in
==============================================================================
--- branches/2015Q3/sysutils/ganglia-webfrontend/files/pkg-message.in	Thu Jul 30 13:27:34 2015	(r393242)
+++ branches/2015Q3/sysutils/ganglia-webfrontend/files/pkg-message.in	Thu Jul 30 13:40:07 2015	(r393243)
@@ -8,7 +8,7 @@ web server configuration file.
 
 Example apache22 configuration:
 
-    Alias /ganglia/ "%%WWWDIR%%"
+    Alias /ganglia "%%WWWDIR%%/"
     <Directory "%%WWWDIR%%">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride None
@@ -18,13 +18,21 @@ Example apache22 configuration:
 
 Example apache24 configuration:
 
-    Alias /ganglia/ "%%WWWDIR%%"
+    Alias /ganglia "%%WWWDIR%%/"
     <Directory "%%WWWDIR%%">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride None
 	Require all granted
     </Directory>
 
+Nginx configuration:
+
+    If you are running Nginx and your document root is set to
+    %%PREFIX%%/www,
+    then you just need to ensure PHP files are handled correctly.
+    If you are using a different document root, then you will need to create
+    the appropriate location directive.
+
 The default configuration is stored in 
 %%WWWDIR%%/conf_default.php.
 If you want to customize the configuration make customizations to

Modified: branches/2015Q3/sysutils/ganglia-webfrontend/pkg-plist
==============================================================================
--- branches/2015Q3/sysutils/ganglia-webfrontend/pkg-plist	Thu Jul 30 13:27:34 2015	(r393242)
+++ branches/2015Q3/sysutils/ganglia-webfrontend/pkg-plist	Thu Jul 30 13:40:07 2015	(r393243)
@@ -1,6 +1,3 @@
-@owner %%WWWOWN%%
-@group %%WWWGRP%%
-@mode 0644
 @sample %%DATADIR%%/conf/default.json.sample
 @sample %%DATADIR%%/conf/event_color.json.sample
 @sample %%DATADIR%%/conf/events.json.sample
@@ -1102,6 +1099,8 @@
 %%WWWDIR%%/version.php
 %%WWWDIR%%/view_content.php
 %%WWWDIR%%/views_view.php
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 @mode 0755
 @dir %%DATADIR%%/dwoo/cache
 @dir %%DATADIR%%/dwoo/compiled



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507301340.t6UDe8RQ045993>