svn commit: r393088 - in head/sysutils/ganglia-webfrontend: . files

[Mark Felder]

Author: feld
Date: Tue Jul 28 18:32:17 2015
New Revision: 393088
URL: https://svnweb.freebsd.org/changeset/ports/393088

Log:
  Fix file permissions so WWWDIR is not writable by WWWOWN
  Improve pkg-message notes on setting up Apache and Nginx
  
  PR:	201908

Modified:
  head/sysutils/ganglia-webfrontend/Makefile
  head/sysutils/ganglia-webfrontend/files/pkg-message.in
  head/sysutils/ganglia-webfrontend/pkg-plist

Modified: head/sysutils/ganglia-webfrontend/Makefile
==============================================================================
--- head/sysutils/ganglia-webfrontend/Makefile	Tue Jul 28 18:13:49 2015	(r393087)
+++ head/sysutils/ganglia-webfrontend/Makefile	Tue Jul 28 18:32:17 2015	(r393088)
@@ -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: head/sysutils/ganglia-webfrontend/files/pkg-message.in
==============================================================================
--- head/sysutils/ganglia-webfrontend/files/pkg-message.in	Tue Jul 28 18:13:49 2015	(r393087)
+++ head/sysutils/ganglia-webfrontend/files/pkg-message.in	Tue Jul 28 18:32:17 2015	(r393088)
@@ -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: head/sysutils/ganglia-webfrontend/pkg-plist
==============================================================================
--- head/sysutils/ganglia-webfrontend/pkg-plist	Tue Jul 28 18:13:49 2015	(r393087)
+++ head/sysutils/ganglia-webfrontend/pkg-plist	Tue Jul 28 18:32:17 2015	(r393088)
@@ -1,6 +1,3 @@
- at owner %%WWWOWN%%
- at group %%WWWGRP%%
- at 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
+ at owner %%WWWOWN%%
+ at group %%WWWGRP%%
 @mode 0755
 @dir %%DATADIR%%/dwoo/cache
 @dir %%DATADIR%%/dwoo/compiled