svn commit: r40938 - head/en_US.ISO8859-1/articles/portbuild

[Mark Linimon]

Author: linimon
Date: Mon Feb 11 13:30:29 2013
New Revision: 40938
URL: http://svnweb.freebsd.org/changeset/doc/40938

Log:
  More work to support the split of PORTBUILD_USER into SRCBUILD_USER:
  
   - remove the old description of the internals of the mkportbuild
     script.  They are insufficient for the new world.
  
   - start refactoring to indicate which configuration variables move
     from portbuild/conf/server.conf to portbuild/admin/conf/admin.conf.
     WIP.

Modified:
  head/en_US.ISO8859-1/articles/portbuild/article.xml

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Mon Feb 11 13:19:11 2013	(r40937)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Mon Feb 11 13:30:29 2013	(r40938)
@@ -2736,41 +2736,26 @@ sysutils/zfs-stats</programlisting>
 
 	  <screen>&prompt.root; sh /home/<replaceable>portbuild</replaceable>/<replaceable>tmp</replaceable>/mkportbuild</screen>
 
-	  <para>This will accomplish all the following 5 steps:</para>
+	  <para>This will accomplish all the following steps:</para>
 
 	  <procedure>
 
 <!-- begin of whitespace-broken area -->
 	<step>
-	  <para>Create the <filename>portbuild</filename> directory:</para>
-
-	  <screen>&prompt.root; mkdir -p ${ZFS_MOUNTPOINT}/portbuild</screen>
+	  <para>Create the <filename>portbuild</filename> directory</para>
 	</step>
 
 	<step>
 	  <para>Create and mount a new <application>zfs</application>
-	    filesystem on it:</para>
-
-	  <screen>zfs create -o mountpoint=${ZFS_MOUNTPOINT}/portbuild ${ZFS_VOLUME}/portbuild</screen>
+	    filesystem on it</para>
 	</step>
 
 	<step>
-	  <para>Set up the directory:</para>
-
-	  <screen>&prompt.root; chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild
-&prompt.root; chmod 775 ${ZFS_MOUNTPOINT}/portbuild
-&prompt.root; ln -sf ${ZFS_MOUNTPOINT}/portbuild /var/portbuild</screen>
-
-	  <note>
-	    <para>The <command>ln</command> is necessary due to a number
-	      of hardcoded paths.  This is a bug.</para>
-	  </note>
+	  <para>Set up the directory</para>
 	</step>
 
 	<step>
 	  <para>Set up the initial repository:</para>
-
-	  <screen>&prompt.user; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild ${ZFS_MOUNTPOINT}/portbuild</screen>
 	</step>
 <!-- end of whitespace-broken area -->
 
@@ -2778,14 +2763,33 @@ sysutils/zfs-stats</programlisting>
 	      <para>Set up the <application>zfs</application>
 		<literal>permission sets</literal>.</para>
 	    </step>
+
+	    <step>
+	      <para>Split ownerships of subdirectories such that
+		<replaceable>PORTBUILD_USER</replaceable> owns, and
+		only owns, files that are used to manage builds and
+		interact with slaves.  The more trustable user
+		<replaceable>SRCBUILD_USER</replaceable> now owns
+		everything else.</para>
+	    </step>
 	  </procedure>
 
 	</step>
       </procedure>
     </sect2>
 
-    <sect2 id="portbuild-repo-configuration">
-      <title>Configuring the <application>portbuild</application> files</title>
+    <sect2 id="srcbuild-user-configuration">
+      <title>Configuring the <application>srcbuild</application>-owned files</title>
+
+      <procedure>
+	<step>
+	  <para>(in process of being refactored)</para>
+	</step>
+      </procedure>
+    </sect2>
+
+    <sect2 id="portbuild-user-configuration">
+      <title>Configuring the <application>portbuild</application>-owned files</title>
 
       <procedure>
 	<step>