svn commit: r244372 - projects/portbuild/conf

[Mark Linimon]

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/"