From owner-svn-doc-head@FreeBSD.ORG  Mon Sep 10 10:47:54 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3FA9D1065673;
	Mon, 10 Sep 2012 10:47:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B2558FC0C;
	Mon, 10 Sep 2012 10:47:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8AAls7d040207;
	Mon, 10 Sep 2012 10:47:54 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8AAlrrM040205;
	Mon, 10 Sep 2012 10:47:53 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201209101047.q8AAlrrM040205@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Sep 2012 10:47:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
	svn-doc-head@freebsd.org
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39517 - head/share/mk
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the doc tree for head
	<svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
	<mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Sep 2012 10:47:54 -0000

Author: gjb
Date: Mon Sep 10 10:47:53 2012
New Revision: 39517
URL: http://svn.freebsd.org/changeset/doc/39517

Log:
  Change WEBGRP and CGIGRP defaults.
  
  The web build uses WEBGRP and CGIGRP to determine group ownership
  during the build phase.  When left unset, the default group is 'www'.
  The problem is that if $USER is not in group 'www', the build will
  fail due to lack of permissions via chgrp(1).
  
  This change sets default values for WEBGRP and CGIGRP to $USER, unless
  explicitly set during build time to prevent chgrp(1)-invoked build
  failure.
  
  Note:  This change has no effect for users currently setting WEBGRP
  and CGIGRP, either via command-line or within scripts.
  
  Reviewed by:	-www@ (silence)

Modified:
  head/share/mk/web.site.mk

Modified: head/share/mk/web.site.mk
==============================================================================
--- head/share/mk/web.site.mk	Mon Sep 10 10:39:27 2012	(r39516)
+++ head/share/mk/web.site.mk	Mon Sep 10 10:47:53 2012	(r39517)
@@ -19,12 +19,23 @@ WEBDIR?=	${.CURDIR:T}
 CGIDIR?=	${.CURDIR:T}
 DESTDIR?=	${HOME}/public_html
 
+_ID?=		/usr/bin/id
+_UID!=		${_ID} -u
+
 WEBOWN?=	${USER}
+.if (${_UID} > 0)
+WEBGRP?=	${USER}
+.else
 WEBGRP?=	www
+.endif
 WEBMODE?=	664
 
 CGIOWN?=	${USER}
+.if (${_UID} > 0)
+CGIGRP?=	${USER}
+.else
 CGIGRP?=	www
+.endif
 CGIMODE?=	775
 
 BUNZIP2?=	/usr/bin/bunzip2