forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Crossley <cross...@apache.org>
Subject Re: svn commit: r602662 - /forrest/trunk/site-author/content/xdocs/zone.xml
Date Thu, 13 Dec 2007 00:10:50 GMT
Those "source" elements were deliberate to give some structure to the text,
e.g. the first one has three separate lines. Changing them to "notes"
loses that structure.

-David

> Author: gmcdonald
> Date: Sun Dec  9 03:42:55 2007
> New Revision: 602662
> 
> URL: http://svn.apache.org/viewvc?rev=602662&view=rev
> Log:
> As per the FIXME, changed to using the note class, also updated the zone SMF config information,
fixes FOR-940
> 
> Modified:
>     forrest/trunk/site-author/content/xdocs/zone.xml
> 
> Modified: forrest/trunk/site-author/content/xdocs/zone.xml
> URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/zone.xml?rev=602662&r1=602661&r2=602662&view=diff
> ==============================================================================
> --- forrest/trunk/site-author/content/xdocs/zone.xml (original)
> +++ forrest/trunk/site-author/content/xdocs/zone.xml Sun Dec  9 03:42:55 2007
> @@ -36,31 +36,21 @@
>          <code>https://svn.apache.org/repos/asf/forrest/zone</code> and
>          additional private stuff is in our pmc/forrest/zone SVN.
>        </p>
> -      <p>
> -        <strong>config</strong>
> -      </p>
> -<!-- FIXME: create better layout for notes, just dumping text inside source elements
for now. -->
> -      <source>
> +      <note label="Config">
>  creates /export/home/config ... $CONFIG
>  directories /forrestbot-*/ are the forrestbot homes, see below.
>  setenv*.sh ... these are sourced by the forrestbots and other
>    cronjobs and user configs, to set the environment.
> -</source>
> -      <p>
> -        <strong>htdocs</strong>
> -      </p>
> -      <source>
> +      </note>
> +      <note label="htdocs">
>  creates /var/apache2/htdocs ... $DOC_ROOT
>  directories /ft/ and /fts/ are the forrestbot config and results, see below.
> -</source>
> -      <p>
> -        <strong>test-sources</strong>
> -      </p>
> -      <source>
> +      </note>
> +      <note label="test-sources">
>  A place to hold sources for various test sites.
>  Normally these would be in the relevant project's SVN.
>  Hold them here until building properly.
> -</source>
> +      </note>
>        <p>
>          All files are owned in the group "other" so any one of us can
>          edit/update. Make sure that your 'umask' is set properly so that new
> @@ -87,25 +77,16 @@
>        </p>
>        <section id="s-forrest">
>          <title>Forrest</title>
> -        <p>
> -          <strong>forrest-trunk</strong>
> -        </p>
> -        <source>
> +        <note label="forrest-trunk">
>  svn checkout of trunk.
>  automatically 'svn update' and 'build' via cron: $CONFIG/update-forrest-trunk.sh
> -</source>
> -        <p>
> -          <strong>forrest-trunk-stable</strong>
> -        </p>
> -        <source>
> +        </note>
> +        <note label="forrest-trunk-stable">
>  svn checkout of trunk, manually updated as needed.
> -</source>
> -        <p>
> -          <strong>forrest-release</strong>
> -        </p>
> -        <source>
> +        </note>
> +        <note label="forrest-release">
>  svn checkout of current release branch, manually updated as needed.
> -</source>
> +</note>
>          <p>
>            To manually update -stable or -release do this:
>          </p>
> @@ -126,23 +107,17 @@
>          There are various forrestbots operating with different versions of
>          forrest. Their home is at $CONFIG
>        </p>
> -      <p>
> -        <strong>$CONFIG/forrestbot-trunk</strong>
> -      </p>
> -      <source>
> +      <note label="$CONFIG/forrestbot-trunk">
>  forrestbot operating with trunk.
>  builds various sites automatically, triggered via cron.
>  Configuration files and the generated results are at $DOC_ROOT/ft/
>  FIXME: The web interface is coming soon.
> -</source>
> -      <p>
> -        <strong>$CONFIG/forrestbot-trunk-stable</strong>
> -      </p>
> -      <source>
> +      </note>
> +      <note label="$CONFIG/forrestbot-trunk-stable">
>  forrestbot operating with trunk-stable.
>  builds various sites, only runs when needed, triggered via cron.
>  Configuration files and the generated results are at $DOC_ROOT/fts/
> -</source>
> +      </note>
>        <p>
>          Forrestbot logs are at $CONFIG/forrestbot-trunk*/logs/ and old ones are
>          cleaned up by the crontab. There is also a log file for each site that
> @@ -186,16 +161,11 @@
>          the output of the cronjob to do svn update to trunk and re-build.
>        </p>
>        <p>
> -        FIXME: Start apache2 on boot (using new Solaris init.d replacement
> -        called smf). At the moment we need to realise that it is down and
> -        manually restart as per http://www.apache.org/dev/solaris-zones.html
> -        Also it seems that /var/run/apache2 is wiped out on reboot, so need to
> -        mkdir again.
> -      </p>
> -      <source>
> -sudo mkdir /var/run/apache2
> -sudo /usr/apache2/bin/apachectl -k start
> -</source>
> +        The Forrest zone is set up using SMF and so should always come back up
> +        automatically after a failure or reboot. See how it is configured on the
> +        <a href="http://www.apache.org/dev/solaris-zones.html#apache2_smf"> Apache2
> +        SMF</a> section of the Solaris Zones page.
> +      </p>
>        <section id="admin-user">
>          <title>User administration</title>
>          <p>
> 
> 

Mime
View raw message