From owner-svn-ports-branches@freebsd.org Thu Jul 30 13:40:10 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D9E099AEA54; Thu, 30 Jul 2015 13:40:09 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B5B5E1B88; Thu, 30 Jul 2015 13:40:09 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6UDe91B045996; Thu, 30 Jul 2015 13:40:09 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6UDe8RQ045993; Thu, 30 Jul 2015 13:40:08 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507301340.t6UDe8RQ045993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 30 Jul 2015 13:40:08 +0000 (UTC) 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 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2015 13:40:10 -0000 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%%/" Options Indexes FollowSymlinks MultiViews AllowOverride None @@ -18,13 +18,21 @@ Example apache22 configuration: Example apache24 configuration: - Alias /ganglia/ "%%WWWDIR%%" + Alias /ganglia "%%WWWDIR%%/" Options Indexes FollowSymlinks MultiViews AllowOverride None Require all granted +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