From owner-svn-src-projects@FreeBSD.ORG  Tue Dec 18 01:23:38 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 78BCADEA;
 Tue, 18 Dec 2012 01:23:38 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 442F28FC0A;
 Tue, 18 Dec 2012 01:23:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBI1NcEM020950;
 Tue, 18 Dec 2012 01:23:38 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBI1NciM020949;
 Tue, 18 Dec 2012 01:23:38 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212180123.qBI1NciM020949@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Tue, 18 Dec 2012 01:23:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244372 - projects/portbuild/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 01:23:38 -0000

Author: linimon (doc,ports committer)
Date: Tue Dec 18 01:23:37 2012
New Revision: 244372
URL: http://svnweb.freebsd.org/changeset/base/244372

Log:
  Add ZFS_PERMISSIONSET for zfsadmin.

Modified:
  projects/portbuild/conf/server.conf

Modified: projects/portbuild/conf/server.conf
==============================================================================
--- projects/portbuild/conf/server.conf	Tue Dec 18 01:13:24 2012	(r244371)
+++ projects/portbuild/conf/server.conf	Tue Dec 18 01:23:37 2012	(r244372)
@@ -28,9 +28,18 @@ SRC_BRANCH_10_SUBDIR=head/
 # directory management definitions
 #
 
+# zfs volume name
 ZFS_VOLUME=a
+# zfs mount point
 ZFS_MOUNTPOINT=/a
+# zfs permission set.  this delegates all permissions except "allow" and
+# "receive".  (see zfsadmin)
+ZFS_PERMISSIONSET=clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot
 
+# portbuild subtree.  holds portbuild codebase plus all architectures.
+PORTBUILD_DIRECTORY=portbuild
+
+# snapshots subtree.  holds ports and src snapshots.
 SNAP_DIRECTORY=snap
 # defines for /a/snap/ports-head/ports
 SNAP_PORTS_DIRECTORY=${SNAP_DIRECTORY}/ports-head
@@ -38,6 +47,7 @@ SNAP_PORTS_DIRECTORY=${SNAP_DIRECTORY}/p
 SRC_DIRECTORY_PREFIX=src-
 SNAP_SRC_DIRECTORY_PREFIX=${SNAP_DIRECTORY}/${SRC_DIRECTORY_PREFIX}
 
+# temporary workspace
 WORLDDIR=${ZFS_MOUNTPOINT}/chroot/
 
 # XXX TODO (note: Python script, so avoid {})
@@ -77,7 +87,8 @@ PDISPATCH_TIMEOUT=360000
 # qmanager definitions (note: Python script, so avoid {})
 #
 
-QMANAGER_PATH=/var/portbuild/qmanager
+#QMANAGER_PATH=${ZFS_MOUNTPOINT}/${PORTBUILD_DIRECTORY}/qmanager
+QMANAGER_PATH=/a/portbuild/qmanager
 QMANAGER_DATABASE_FILE=qdb.sl3
 QMANAGER_SOCKET_FILE=/tmp/.qmgr
 
@@ -92,6 +103,7 @@ QMANAGER_RUNAWAY_THRESHOLD=100
 
 #
 # upload definitions (see 'cpdistfiles')
+# XXX MCL TO GO AWAY
 #
 
 UPLOAD_DIRECTORY="w/ports/distfiles/"