From owner-svn-doc-head@freebsd.org  Thu Jul 23 02:51:11 2015
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@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 F13C39A89E1;
 Thu, 23 Jul 2015 02:51:11 +0000 (UTC)
 (envelope-from wblock@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 D505D14C1;
 Thu, 23 Jul 2015 02:51:11 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6N2pBjG084920;
 Thu, 23 Jul 2015 02:51:11 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6N2pBE7084919;
 Thu, 23 Jul 2015 02:51:11 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201507230251.t6N2pBE7084919@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 23 Jul 2015 02:51:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r47051 - head/share/mk
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Thu, 23 Jul 2015 02:51:12 -0000

Author: wblock
Date: Thu Jul 23 02:51:10 2015
New Revision: 47051
URL: https://svnweb.freebsd.org/changeset/doc/47051

Log:
  Allow installing website as an unprivileged user.
  
  Reviewed by:	hrs
  Approved by:	doceng (implicit)

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

Modified: head/share/mk/web.site.mk
==============================================================================
--- head/share/mk/web.site.mk	Wed Jul 22 21:57:34 2015	(r47050)
+++ head/share/mk/web.site.mk	Thu Jul 23 02:51:10 2015	(r47051)
@@ -11,6 +11,7 @@
 # clean -- remove anything generated by processing
 #
 
+.include "doc.install.mk"
 .include "doc.commands.mk"
 
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -24,17 +25,17 @@ DESTDIR?=	${HOME}/public_html
 _ID?=		/usr/bin/id
 _UID!=		${_ID} -u
 
-WEBOWN?=	${USER}
+WEBOWN?=	${USERNAME}
 .if (${_UID} > 0)
-WEBGRP?=	${USER}
+WEBGRP?=	${GROUPNAME}
 .else
 WEBGRP?=	www
 .endif
 WEBMODE?=	664
 
-CGIOWN?=	${USER}
+CGIOWN?=	${USERNAME}
 .if (${_UID} > 0)
-CGIGRP?=	${USER}
+CGIGRP?=	${GROUPNAME}
 .else
 CGIGRP?=	www
 .endif