From owner-freebsd-doc@FreeBSD.ORG Wed Feb 23 20:20:08 2011 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77EA9106566B for ; Wed, 23 Feb 2011 20:20:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2F6D08FC14 for ; Wed, 23 Feb 2011 20:20:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1NKK8H0026004 for ; Wed, 23 Feb 2011 20:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1NKK8HI026003; Wed, 23 Feb 2011 20:20:08 GMT (envelope-from gnats) Resent-Date: Wed, 23 Feb 2011 20:20:08 GMT Resent-Message-Id: <201102232020.p1NKK8HI026003@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jason Helfman Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A1A3106566C; Wed, 23 Feb 2011 20:10:18 +0000 (UTC) (envelope-from jhelfman@experts-exchange.com) Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251]) by mx1.freebsd.org (Postfix) with ESMTP id 0932B8FC1D; Wed, 23 Feb 2011 20:10:17 +0000 (UTC) Received: from mail.experts-exchange.com (localhost [127.0.0.1]) by mail.experts-exchange.com (Postfix) with ESMTP id A9C866F3B7F; Wed, 23 Feb 2011 12:10:17 -0800 (PST) Received: from mail.experts-exchange.com ([127.0.0.1]) by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xIhUDEPlDJ6A; Wed, 23 Feb 2011 12:10:17 -0800 (PST) Received: from experts-exchange.com (unknown [192.168.103.122]) by mail.experts-exchange.com (Postfix) with SMTP id 726816F3B7C; Wed, 23 Feb 2011 12:10:15 -0800 (PST) Received: (nullmailer pid 55885 invoked by uid 1001); Wed, 23 Feb 2011 20:06:53 -0000 Message-Id: <1298491613.406910.55884.nullmailer@experts-exchange.com> Date: Wed, 23 Feb 2011 12:06:53 -0800 From: Jason Helfman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: manolis@FreeBSD.org Subject: docs/154986: [maintainer-update] [patch] freebsd-update-server : content cleanup, move to callouts X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jason Helfman List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 20:20:08 -0000 >Number: 154986 >Category: docs >Synopsis: [maintainer-update] [patch] freebsd-update-server : content cleanup, move to callouts >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 23 20:20:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jason Helfman >Release: FreeBSD 8.1-RELEASE i386 >Organization: Experts Exchange, LLC. >Environment: System: FreeBSD eggman.experts-exchange.com 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: 1. Reword of "much slower..." to "potentially slower..." 2. Cleanup redundancy of mailing list stable in tips. 3. Cleanup layout. Move to callouts. >How-To-Repeat: >Fix: Index: freebsd-update-server/Makefile =================================================================== RCS file: /home/jhelfman/ncvs/doc/en_US.ISO8859-1/articles/freebsd-update-server/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- freebsd-update-server/Makefile 13 Feb 2011 17:53:26 -0000 1.1 +++ freebsd-update-server/Makefile 23 Feb 2011 19:57:29 -0000 @@ -17,6 +17,12 @@ SRCS= article.sgml SRCS+= ${EXTRAS} +IMAGES_LIB+= callouts/1.png +IMAGES_LIB+= callouts/2.png +IMAGES_LIB+= callouts/3.png +IMAGES_LIB+= callouts/4.png +IMAGES_LIB+= callouts/5.png + afterinstall: .for entry in ${EXTRAS} ${INSTALL_DOCS} ${.CURDIR}/${entry} ${DESTDIR} Index: freebsd-update-server/article.sgml =================================================================== RCS file: /home/jhelfman/ncvs/doc/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml,v retrieving revision 1.2 diff -u -r1.2 article.sgml --- freebsd-update-server/article.sgml 14 Feb 2011 20:41:53 -0000 1.2 +++ freebsd-update-server/article.sgml 23 Feb 2011 19:55:06 -0000 @@ -62,7 +62,7 @@ Running a &fbus.ap; makes it easier to deploy security and software patches to selected test machines before rolling them out to production. It also means a number of systems can be updated from the - local network rather than a much slower Internet connection. + local network rather than a potentially slower Internet connection. This article outlines the steps involved in creating an internal &fbus.ap;. @@ -127,37 +127,38 @@ Here is the default build.conf, which should be modified to suit your environment. - + # Main configuration file for FreeBSD Update builds. The # release-specific configuration data is lower down in # the scripts tree. # Location from which to fetch releases -export FTP=ftp://ftp2.freebsd.org/pub/FreeBSD/releases +export FTP=ftp://ftp2.freebsd.org/pub/FreeBSD/releases # Host platform export HOSTPLATFORM=`uname -m` # Host name to use inside jails -export BUILDHOSTNAME=${HOSTPLATFORM}-builder.daemonology.net +export BUILDHOSTNAME=${HOSTPLATFORM}-builder.daemonology.net # Location of SSH key -export SSHKEY=/root/.ssh/id_dsa +export SSHKEY=/root/.ssh/id_dsa # SSH account into which files are uploaded -MASTERACCT=builder@wadham.daemonology.net +MASTERACCT=builder@wadham.daemonology.net # Directory into which files are uploaded -MASTERDIR=update-master.freebsd.org +MASTERDIR=update-master.freebsd.org + + + Parameters for consideration would be: - - - FTP + + - This is the location where ISO images are downloaded from (by the fetchiso() subroutine of scripts/build.subr). The location @@ -171,24 +172,16 @@ architecture-specific area at scripts/RELEASE/ARCHITECTURE/build.subr and applying local changes. - - - - - BUILDHOSTNAME + - + The name of the build host. This information will be displayed on updated systems when issuing: &prompt.user; uname -v - - - - - SSHKEY + - + The SSH key for uploading files to the update server. A key pair can be created by typing ssh-keygen -t dsa. This parameter is @@ -199,27 +192,18 @@ The &man.ssh-keygen.1; manual page has more detailed information about SSH and the appropriate steps for creating and using one. - - + - - MASTERACCT - - + Account for uploading files to the update server. - - - - - MASTERDIR + - + Directory on the update server where files are uploaded to. - - - + + The default build.conf file shipped with the freebsd-update-server sources is @@ -242,16 +226,11 @@ options for &os; 7.2-RELEASE on &arch.amd64; should be similar to: + # SHA256 hash of RELEASE disc1.iso image. -export RELH=1ea1f6f652d7c5f5eab7ef9f8edbed50cb664b08ed761850f95f48e86cc71ef5 +export RELH=1ea1f6f652d7c5f5eab7ef9f8edbed50cb664b08ed761850f95f48e86cc71ef5 - - The &man.sha256.1; hash key for the desired release, is - published within the respective release announcement. - - - # Components of the world, source, and kernels +# Components of the world, source, and kernels export WORLDPARTS="base catpages dict doc games info manpages proflibs lib32" export SOURCEPARTS="base bin contrib crypto etc games gnu include krb5 \ lib libexec release rescue sbin secure share sys tools \ @@ -259,9 +238,16 @@ export KERNELPARTS="generic" # EOL date -export EOL=1275289200 +export EOL=1275289200 - + + + The &man.sha256.1; hash key for the desired release, is + published within the respective release announcement. + + + To generate the "End of Life" number for build.conf, refer to the "Estimated EOL" posted on the . The value of EOL can be derived from the date listed on the web site, using the &man.date.1; utility, for example: - &prompt.user; date -j -f '%Y%m%d-%H%M%S' '20090401-000000' '+%s' - + + @@ -818,7 +804,7 @@ url="&url.books.handbook;/firewalls.html">firewall rule to block outgoing RST packets. Due to a bug noted in a posting - on the &a.stable; mailing list in April 2009, there may be + on the &a.stable; in April 2009, there may be time-outs and failures when updating a system. >Release-Note: >Audit-Trail: >Unformatted: