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)

3 files changed, 13 insertions, 5 deletions

diff --git a/sysutils/ganglia-webfrontend/Makefile b/sysutils/ganglia-webfrontend/Makefile
index 785e99b8232a..91c5d74d8360 100644
--- a/sysutils/ganglia-webfrontend/Makefile
+++ b/sysutils/ganglia-webfrontend/Makefile
@@ -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
diff --git a/sysutils/ganglia-webfrontend/files/pkg-message.in b/sysutils/ganglia-webfrontend/files/pkg-message.in
index ec3a11b8fbd7..0d9710707a19 100644
--- a/sysutils/ganglia-webfrontend/files/pkg-message.in
+++ b/sysutils/ganglia-webfrontend/files/pkg-message.in
@@ -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
diff --git a/sysutils/ganglia-webfrontend/pkg-plist b/sysutils/ganglia-webfrontend/pkg-plist
index 93588f59c1a3..00b6ea93ced6 100644
--- a/sysutils/ganglia-webfrontend/pkg-plist
+++ b/sysutils/ganglia-webfrontend/pkg-plist
@@ -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