Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Mar 2013 10:55:32 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r41143 - head/en_US.ISO8859-1/articles/portbuild
Message-ID:  <201303091055.r29AtWMg019671@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Sat Mar  9 10:55:31 2013
New Revision: 41143
URL: http://svnweb.freebsd.org/changeset/doc/41143

Log:
  Make it clear that squid can either be run on the clients (as it was in the
  old days), or on the server.  The latter is more efficient.
  
  Factor out the ganglia instructions as being optional.
  
  While here, remove some more cruft.

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	Fri Mar  8 17:30:08 2013	(r41142)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Sat Mar  9 10:55:31 2013	(r41143)
@@ -1501,6 +1501,13 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5
 	      command is no longer used.</para>
 	  </note>
 	</step>
+
+	<step>
+	  <para>Decide if you will be using a local
+	    <application>squid</application> cache on the client,
+	    instead of the server.  It is more efficient to run it
+	    on the server.  If you are doing that, skip the "squid"
+	    steps below.)</para>
       </procedure>
     </sect2>
 
@@ -1627,12 +1634,21 @@ options         NFSSERVER               
 	    </listitem>
 
 	    <listitem>
-	      <para>Also add the following users:</para>
+	      <para>If you are using <application>ganglia</application>
+		for monitoring, add the following user:</para>
 
-	      <programlisting>squid:*:100:100::0:0:User &amp;:/usr/local/squid:/bin/sh
-ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
+	      <programlisting>ganglia:*:102:102::0:0:User &amp;:/usr/local/ganglia:/bin/sh</programlisting>
 
-	      <para>Add them to <filename>etc/group</filename> as well.</para>
+	      <para>Add it to <filename>etc/group</filename> as well.</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>If you are using a local <application>squid</application>
+		cache on the client, add the following user:</para>
+
+	      <programlisting>squid:*:100:100::0:0:User &amp;:/usr/local/squid:/bin/sh</programlisting>
+
+	      <para>Add it to <filename>etc/group</filename> as well.</para>
 	    </listitem>
 
 	    <listitem>
@@ -1682,13 +1698,19 @@ nfs_client_enable="YES"
 ntpd_enable="YES"
 sendmail_enable="NONE"
 sshd_enable="YES"
-sshd_program="/usr/local/sbin/sshd"
+sshd_program="/usr/local/sbin/sshd"</programlisting>
 
-gmond_enable="YES"
-squid_enable="YES"
+	      <para>If you are using <application>ganglia</application>
+		for monitoring, add the following</para>
+
+	      <programlisting>gmond_enable="YES"</programlisting>
+
+	      <para>If you are using a local <application>squid</application>
+		cache on the client, add the following</para>
+
+	      <programlisting>squid_enable="YES"
 squid_chdir="<filename>/<replaceable>usr2</replaceable>/squid/logs</filename>"
 squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"</programlisting>
-
 	      <para>Required entries for VMWare-based nodes:</para>
 
 	      <programlisting>vmware_guest_vmmemctl_enable="YES"
@@ -1774,13 +1796,21 @@ squid_pidfile="<filename>/<replaceable>u
 	  <para>Install the following ports:</para>
 
 	  <programlisting>net/rsync
-security/openssh-portable (with HPN on)
-security/sudo
-sysutils/ganglia-monitor-core (with GMETAD off)
-www/squid (with SQUID_AUFS on)</programlisting>
+security/sudo</programlisting>
+
+	  <para>You may also wish to install:</para>
+
+	  <programlisting>security/openssh-portable (with HPN on)</programlisting>
+
+	  <para>If you are using <application>ganglia</application>
+	    for monitoring, install the following:</para>
+
+	  <programlisting>sysutils/ganglia-monitor-core (with GMETAD off)</programlisting>
 
-	  <para>There is a WIP to create a meta-port, but it is not yet
-	    complete.</para>
+	  <para>If you are using a local <application>squid</application>
+	    cache on the client, install the following</para>
+
+	  <programlisting>www/squid (with SQUID_AUFS on)</programlisting>
 	</step>
 
 	<step>
@@ -1801,7 +1831,8 @@ www/squid (with SQUID_AUFS on)</programl
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>Modify
+	      <para>If you are using <application>ganglia</application>,
+	        modify
 		<filename>usr/local/etc/gmond.conf</filename>:</para>
 
 	      <screen>21,22c21,22
@@ -1849,7 +1880,8 @@ touch /tmp/.boot_finished</programlistin
 	    </listitem>
 
 	    <listitem>
-	      <para>Modify
+	      <para>If you are using a local <application>squid</application>
+		cache, modify,
 		<filename>usr/local/etc/squid/squid.conf</filename>:</para>
 
 	      <screen>288,290c288,290
@@ -1924,8 +1956,12 @@ portbuild     ALL=(ALL) NOPASSWD: ALL</p
 	  <screen>&prompt.root; <userinput>mkdir portbuild</userinput>
 &prompt.root; <userinput>chown portbuild:portbuild portbuild</userinput>
 &prompt.root; <userinput>mkdir pkgbuild</userinput>
-&prompt.root; <userinput>chown portbuild:portbuild pkgbuild</userinput>
-&prompt.root; <userinput>mkdir squid</userinput>
+&prompt.root; <userinput>chown portbuild:portbuild pkgbuild</userinput></screen>
+
+	  <para>If you are using a local <application>squid</application>
+	    cache:</para>
+
+	  <screen>&prompt.root; <userinput>mkdir squid</userinput>
 &prompt.root; <userinput>mkdir squid/cache</userinput>
 &prompt.root; <userinput>mkdir squid/logs</userinput>
 &prompt.root; <userinput>chown -R squid:squid squid</userinput></screen>
@@ -1946,7 +1982,8 @@ portbuild     ALL=(ALL) NOPASSWD: ALL</p
 	</step>
 
 	<step>
-	  <para>As root, initialize the <command>squid</command>
+	  <para>If you are using a local <application>squid</application>
+	    cache, as root, initialize the <command>squid</command>
 	    directories:</para>
 
 	  <screen><userinput>squid -z</userinput></screen>
@@ -2033,8 +2070,6 @@ MASTER_SITE_OVERRIDE= \
 	  <para>Suggested values:</para>
 
 	  <programlisting>disconnected=1
-http_proxy="http://localhost:3128/"
-squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename>
 scratchdir=<filename>/<replaceable>usr2</replaceable>/pkgbuild</filename>
 client_user=portbuild
 sudo_cmd="sudo -H"
@@ -2043,6 +2078,18 @@ rsync_gzip=-z
 infoseek_host=localhost
 infoseek_port=<replaceable>${tunelled-tcp-port}</replaceable></programlisting>
 
+	  <para>If you will be using <application>squid</application>
+	    on the client:</para>
+
+	  <programlisting>http_proxy="http://localhost:3128/"
+squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename></programlisting>
+
+	  <para>If, instead, you will be using <application>squid</application>
+	    on the server:</para>
+
+	  <programlisting>
+http_proxy="http://<replaceable>servername</replaceable>:3128/"</programlisting>;
+
 	  <para>Possible other values:</para>
 
 	  <programlisting>use_md_swap=1
@@ -2064,7 +2111,8 @@ ssh_cmd="/usr/local/bin/ssh"</programlis
 	</step>
 
 	<step>
-	  <para>Add an appropriate <literal>data_source</literal> entry to
+	  <para>If you are using <application>ganglia</application>,
+	    add an appropriate <literal>data_source</literal> entry to
 	    <filename>/usr/local/etc/gmetad.conf</filename>:</para>
 
 	  <programlisting>data_source "<replaceable>arch</replaceable>/<replaceable>location</replaceable> Package Build Cluster" 30 <replaceable>hostname</replaceable></programlisting>
@@ -2480,9 +2528,6 @@ zfs destroy -r a/snap/src-<replaceable>o
   <sect1 id="new-head-node">
     <title>How to configure a new head node (pointyhat instance)</title>
 
-    <para>Please talk to Mark Linimon before making any changes
-      to this section.</para>
-
     <sect2 id="pointyhat-basics">
       <title>Basic installation</title>
 
@@ -2537,8 +2582,6 @@ fsck_y_enable="YES"
 apache22_enable="YES"
 apache_flags=""
 apache_pidfile="/var/run/httpd.pid"
-gmetad_enable="YES"
-gmond_enable="YES"
 inetd_enable="YES"
 inetd_flags="-l -w"
 mountd_enable="YES"
@@ -2551,6 +2594,17 @@ rpc_lockd_enable="NO"
 rpc_statd_enable="YES"
 sendmail_enable="NONE"
 smartd_enable="YES"</programlisting>
+
+	  <para>If you are using <application>ganglia</application>,
+	    add:</para>
+
+	  <programlisting>gmetad_enable="YES"
+gmond_enable="YES"</programlisting>
+
+	  <para>If you will be using a <application>squid</application>
+	    cache on the server, rather than the clients:</para>
+
+	  <programlisting>squid_enable="YES"</programlisting>
 	</step>
 
 	<step>
@@ -2603,8 +2657,6 @@ devel/py-setuptools
 devel/subversion
 net/nc
 net/rsync
-sysutils/ganglia-monitor-core (with GMETAD off)
-sysutils/ganglia-webfrontend (compile with -DWITHOUT_X11)
 www/apache22 (with EXT_FILTER)</programlisting>
 
 	  <para>Expect those to bring in, among others:</para>
@@ -2613,6 +2665,17 @@ www/apache22 (with EXT_FILTER)</programl
 lang/perl-5.14 (or successor)
 lang/python27 (or sucessor)</programlisting>
 
+	  <para>If you are using <application>ganglia</application>,
+	    add:</para>
+
+	  <programlisting>sysutils/ganglia-monitor-core (with GMETAD off)
+sysutils/ganglia-webfrontend (compile with -DWITHOUT_X11)</programlisting>
+
+	  <para>If you will be using a <application>squid</application>
+	    cache on the server, rather than the clients:</para>
+
+	  <programlisting>www/squid (with SQUID_AUFS on)</programlisting>
+
 	  <para>The following ports (or their latest successors) are strongly suggested:</para>
 
 	  <programlisting>devel/ccache



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303091055.r29AtWMg019671>