vcl-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jftho...@apache.org
Subject svn commit: r1430520 - in /vcl/site/trunk/content: confluence_export/ docs/archives/ docs/archives/old-releases/
Date Tue, 08 Jan 2013 20:52:47 GMT
Author: jfthomps
Date: Tue Jan  8 20:52:46 2013
New Revision: 1430520

URL: http://svn.apache.org/viewvc?rev=1430520&view=rev
Log:
migrating in 2.2 install guide from confluence

Added:
    vcl/site/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.mdtext   (with props)
    vcl/site/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.mdtext   (with props)
    vcl/site/trunk/content/docs/archives/
    vcl/site/trunk/content/docs/archives/old-releases/
Modified:
    vcl/site/trunk/content/confluence_export/2.2-database-configuration.mdtext
    vcl/site/trunk/content/confluence_export/2.2-management-node-installation.mdtext
    vcl/site/trunk/content/confluence_export/2.2-web-code-installation.mdtext
    vcl/site/trunk/content/confluence_export/adding-ldap-authentication.mdtext
    vcl/site/trunk/content/confluence_export/further-steps-if-using-only-vmware.mdtext
    vcl/site/trunk/content/confluence_export/further-steps-if-using-xcat.mdtext
    vcl/site/trunk/content/confluence_export/missing_from_export.mdtext
    vcl/site/trunk/content/confluence_export/upgrade-from-previous-version.mdtext
    vcl/site/trunk/content/confluence_export/vcl-2.2.mdtext

Modified: vcl/site/trunk/content/confluence_export/2.2-database-configuration.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/2.2-database-configuration.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/2.2-database-configuration.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/2.2-database-configuration.mdtext Tue Jan  8 20:52:46 2013
@@ -1,17 +1,18 @@
 Title: 2.2 Database Configuration
-{excerpt}This page describes how to create the VCL MySQL database and
-import the VCL database schema.{excerpt}
+
+This page describes how to create the VCL MySQL database and
+import the VCL database schema.
 
 
 <a name="2.2DatabaseConfiguration-*Prerequisites*"></a>
-## *Prerequisites*
+## Prerequisites
 
 1. You should have mysql server 5.x installed.&nbsp;If mysql server is not
 installed:
 
-    yum install mysql-server -y
-    /sbin/chkconfig --level 345 mysqld on
-    /sbin/service mysqld start
+        yum install mysql-server -y
+        /sbin/chkconfig --level 345 mysqld on
+        /sbin/service mysqld start
 
 1. Your host based firewall (IPTables) should be configured to allow traffic
 from the web server and management server to connect to TCP port 3306
@@ -19,7 +20,7 @@ from the web server and management serve
 
 
 <a name="2.2DatabaseConfiguration-*SettingUptheDatabaseforVCL*"></a>
-## *Setting Up the Database for VCL*
+## Setting Up the Database for VCL
 
 1. start the mysql command line client by running 
 

Modified: vcl/site/trunk/content/confluence_export/2.2-management-node-installation.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/2.2-management-node-installation.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/2.2-management-node-installation.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/2.2-management-node-installation.mdtext Tue Jan  8 20:52:46 2013
@@ -1,14 +1,15 @@
 Title: 2.2 Management Node Installation
-{excerpt}This page describes how to install and configure the backend VCL
+
+This page describes how to install and configure the backend VCL
 management node components including the required Perl modules, VCL daemon
-(vcld), and Windows utility dependencies.{excerpt}
+(vcld), and Windows utility dependencies.
 
 <a name="2.2ManagementNodeInstallation-Assumptions"></a>
 ## Assumptions
 
-The following instructions assume the VCL [database has been installed and configured](database-configuration.html)
- and that the managment node information has been added to the database as
-described on the [web code installation page|Web Code Installation]
+The following instructions assume the VCL [database has been installed and configured](2.2-database-configuration.html)
+ and that the management node information has been added to the database as
+described on the [web code installation page](2.2-web-code-installation.html)
 . This also assumes that the perl-DBD-MySQL-3.x and the mysql client
 (mysql-5.x) packages are installed, for database communications.
 
@@ -16,9 +17,8 @@ described on the [web code installation 
 ## Installing VCL Management Node Code - Perl Daemon
 
 1. If you haven't already done so, download and extract a copy of the latest
-release. There is a link to it under the Project Resources section on our
-wiki [home page](apache-vcl.html)
-. Look for "Current version".
+release. There is a link to it on our [download page](/downloads/download.cgi)
+.
 1. copy the "managementnode" directory to a location, typically /usr/local
 
     cp -r managementnode /usr/local/vcl
@@ -47,6 +47,7 @@ use the package management utility for y
 
 To install these packages using yum:
 
+    yum install expat expat-devel gcc krb5-libs krb5-devel libxml2 libxml2-devel openssl openssl-devel perl-DBD-MySQL xmlsec1-openssl nmap -y
 
 
 <a name="2.2ManagementNodeInstallation-InstallRequiredPerlModules"></a>
@@ -54,9 +55,9 @@ To install these packages using yum:
 
 The VCL Perl code running on the management node requires additional Perl
 modules in order to run. These Perl modules are available from [CPAN - The Comprehensive Perl Archive Network](http://cpan.org/)
-. A search engine for CPAN modules is available at [search.cpan.org|http://search.cpan.org/]
-.  The Perl modules are licensed under the [Artistic|http://dev.perl.org/licenses/artistic.html]
- and [GPL|http://www.opensource.org/licenses/gpl-license.php]
+. A search engine for CPAN modules is available at [search.cpan.org](http://search.cpan.org/)
+.  The Perl modules are licensed under the [Artistic](http://dev.perl.org/licenses/artistic.html)
+ and [GPL](http://www.opensource.org/licenses/gpl-license.php)
  licenses.
 
 * [Class-Data-Inheritable](http://search.cpan.org/dist/Class-Data-Inheritable/)
@@ -83,8 +84,9 @@ A script is provided in the managementno
 *install_perl_libs.pl* which will attempt to download and install the
 required perl libraries.&nbsp; Run the script:
 
+    perl /usr/local/vcl/bin/install_perl_libs.pl
 
-
+The script will hang or terminate if it encounters a problem.  If this occurs, manually run the last command the script attempted.  The command should be listed in the output.  You will need to troubleshoot the problem.  The most likely cause of the problem is a missing Linux package.  Make sure the required packages are installed.
 
 <a name="2.2ManagementNodeInstallation-HowtoTestifRequiredPerlModulesareInstalled"></a>
 #### How to Test if Required Perl Modules are Installed
@@ -97,15 +99,16 @@ Executing utils.pm does not actually do 
 VCL will be able to run.&nbsp; If any Perl modules are missing you will see
 "Can't locate" lines:
 
+    Can't locate HTTP/Headers.pm in @INC (@INC contains:...)
 
+Once all of the required modules are installed, you should see output similar to the following:
 
+    BIN PATH: /usr/local/vcl/lib/VCL
     pre-execution: config file being used: /etc/vcl/vcld.conf
     Uncaught exception from user code:
-            VCLD : /etc/vcl/vcld.conf does not exist, exiting --  No such file
-or directory
-    BEGIN failed--compilation aborted at /usr/local/vcl/lib/VCL/utils.pm line
-616.
-     at /usr/local/vcl/lib/VCL/utils.pm line 616
+            VCLD : /etc/vcl/vcld.conf does not exist, exiting -- No such file or directory
+    BEGIN failed--compilation aborted at /usr/local/vcl/lib/VCL/utils.pm line 616.
+    at /usr/local/vcl/lib/VCL/utils.pm line 616
 
 
 <a name="2.2ManagementNodeInstallation-WhattodoifaModuleisMissing"></a>
@@ -120,97 +123,141 @@ line
 #### How to Install a Perl&nbsp;Module Manually
 
 1. Change directories to /tmp:
-*cd /tmp*&nbsp;
+
+    **cd /tmp**
+
 1. Download the module's source package using wget:
-*wget* *[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.827.tar.gz](http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.827.tar.gz)
-*
+
+    **wget [http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.827.tar.gz](http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.827.tar.gz)**
+
 1. Unpack the source package using tar:
-*tar xzf libwww-perl-5.827.tar.gz*
+
+    **tar xzf libwww-perl-5.827.tar.gz**
+
 1. The previous command should have created a libwww-perl-5.827 directory,
 change to this directory:
-*cd libwww-perl-5.827*
+
+    **cd libwww-perl-5.827**
+
 1. Create a makefile with the following command:
-*perl Makefile.PL*
+
+    **perl Makefile.PL**
+
 1. Compile the module:
-*make*
+
+    **make**
+
 1. Test the module:
-*make test*
+
+    **make test**
+
 1. Install the module:
-*make install*
-The last line you should see should be:
 
+    **make install**
+
+The last line you should see should be:
 
+    /usr/bin/make install  -- OK
 
 <a name="2.2ManagementNodeInstallation-HowtoInstallaPerlModuleUsingCPAN"></a>
 #### How to Install a Perl Module Using CPAN
 
 1. Enter the CPAN shell:
-*perl \-MCPAN \-e shell*
+
+    **perl \-MCPAN \-e shell**
+
 1. You will need to configure CPAN if it's the first time it is being run.
-Enter *No* at the first prompt to auto-configure the CPAN module.
+Enter **No** at the first prompt to auto-configure the CPAN module.
+
 1. Search for a module using the "m" command:
-*m /Zlib/*
-You should find the module you were looking for on a line like this:
 
+    **m /Zlib/**
+
+    You should find the module you were looking for on a line like this:
+
+        Module          Compress::Zlib  (P/PM/PMQS/IO-Compress-2.020.tar.gz)
 
 1. Install the module:
-*install Compress::Zlib*
-1. Answer *yes* if asked to install any prerequisite modules
-The last line you should see should be:
 
+    **install Compress::Zlib**
+
+1. Answer **yes** if asked to install any prerequisite modules
+The last line you should see should be:
 
+    /usr/bin/make install  -- OK
 
 <a name="2.2ManagementNodeInstallation-Configurevcld.conf"></a>
 ## Configure vcld.conf
 
 1. Create the /etc/vcl directory:
-*mkdir /etc/vcl*&nbsp;
+
+    **mkdir /etc/vcl**
+
 1. Copy the generic vcld.conf file to /etc/vcl:
-*cp /usr/local/vcl/etc/vcl/vcld.conf /etc/vcl*
+
+    **cp /usr/local/vcl/etc/vcl/vcld.conf /etc/vcl**
+
 1. Edit the /etc/vcl/vcld.conf file:
-*vi /etc/vcl/vcld.conf*
-The following lines must be configured in order to start the VCL daemon
+
+    **vi /etc/vcl/vcld.conf**
+
+    The following lines must be configured in order to start the VCL daemon 
 (vcld) and allow it to check in to the database:
-1. * FQDN - the fully qualified name of the management node, this should
+
+    * FQDN - the fully qualified name of the management node, this should
 match the name that was configured for the management node in the database
-1. * server - the IP address or FQDN of the database server
-1. * LockerWrtUser - database user account with write privileges
-1. * wrtPass - database user password
+    * server - the IP address or FQDN of the database server
+    * LockerWrtUser - database user account with write privileges
+    * wrtPass - database user password
+
 1. Save the vcld.conf file
 
 <a name="2.2ManagementNodeInstallation-InstalltheVCLDaemon(vcld)&nbsp;Service"></a>
 ## Install the VCL Daemon (vcld)&nbsp;Service
 
 1. Copy the vcld service script to /etc/init.d and name it vcld:
-*cp /usr/local/vcl/bin/S99vcld.linux /etc/init.d/vcld*
+
+    **cp /usr/local/vcl/bin/S99vcld.linux /etc/init.d/vcld**
+
 1. Add the vcld service using chkconfig:
-*/sbin/chkconfig \--add vcld*
+
+    **/sbin/chkconfig \--add vcld**
+
 1. Configure the vcld service to automatically run at runtime levels 3-5:
-*/sbin/chkconfig \--level 345 vcld on*
+
+    **/sbin/chkconfig \--level 345 vcld on**
 
 <a name="2.2ManagementNodeInstallation-StartandCheck&nbsp;thevcldService"></a>
 ## Start and Check&nbsp;the vcld Service
 
 1. Start the vcld service:
-*/sbin/service vcld start*
-You should see output similar to the following:
 
-    pre-execution: config file being used: /etc/vcl/vcld.conf
-    FQDN is not listed
-    pre-execution: process name is set to: vcld
-    pre-execution: verbose mode is set to: 1
-    pre-execution: testing mode is set to: 0
-    pre-execution: log file being used: /var/log/vcld.log
-    pre-execution: PID file being used: /var/run/vcld.pid
-    Created process 23696 renamed to vcld ...
-                                                               [  OK  ]
+    **/sbin/service vcld start**
+
+    You should see output similar to the following:
+
+        Starting vcld daemon: BIN PATH: /usr/local/vcl/bin
+        pre-execution: config file being used: /etc/vcl/vcld.conf
+        FQDN is not listed
+        pre-execution: process name is set to: vcld
+        pre-execution: verbose mode is set to: 1
+        pre-execution: testing mode is set to: 0
+        pre-execution: log file being used: /var/log/vcld.log
+        pre-execution: PID file being used: /var/run/vcld.pid
+        Created process 23696 renamed to vcld ...
+                                                              [ OK ]
+    Note: the vcld service can also be started by running the service script directly:
+
+    **/etc/init.d/vcld start**
 
-*/etc/init.d/vcld start*
 1. Check the vcld service by monitoring the vcld.log file:
-*tail \-f /var/log/vcld.log*
-You should see the following being added to the log file every few seconds
+
+    **tail \-f /var/log/vcld.log**
+
+    You should see the following being added to the log file every few seconds
 if the management node is checking in with the database:
 
+        2009-06-16 16:57:15|15792|vcld:main(165)|lastcheckin time updated for management node 18: 2009-06-16 16:57:15
 
 
 <a name="2.2ManagementNodeInstallation-ConfiguretheSSHClient"></a>
@@ -220,12 +267,10 @@ To insure that the management node can S
 without problems, you will need to edit the SSH client config for the root
 user:
 
-
-
+    vi /root/.ssh/config
 
 Add the following lines to the top of the configuration file.
 
-
     Host <vmhost> <vmhost ip>
        UserKnownHostsFile /dev/null
        StrictHostKeyChecking no
@@ -233,14 +278,16 @@ Add the following lines to the top of th
 
 Where:
 
-* <vmhost> - Is a wildcard reference to the hostnames for your virtual
+* &lt;vmhost&gt; - Is a wildcard reference to the hostnames for your virtual
 machines.
-** For example, if your VM hostnames look like: vmhost1, vmhost2,
+
+    * For example, if your VM hostnames look like: vmhost1, vmhost2,
 vmhost3.... then replace <vmhost> with "vmhost*"
 
-* <vmhost ip> - Is a wildcard IP reference to the IPs used by your virtual
+* &lt;vmhost ip&gt; - Is a wildcard IP reference to the IPs used by your virtual
 machines.
-** For example, if your VMs all have IP addresses starting with 10.0.0,
+
+    * For example, if your VMs all have IP addresses starting with 10.0.0,
 then replace <vmhost ip> with "10.0.0.*"
 
 This will insure that new VM hosts will not hang on the known hosts prompts
@@ -265,6 +312,7 @@ the Deployment Tools.&nbsp; You do not n
 
 
 Download: [Windows XP Service Pack 3 Deployment Tools](http://www.microsoft.com/downloads/details.aspx?FamilyID=673a1019-8e3e-4be0-ac31-70dd21b5afa7&displaylang=en)
+
 Download: [System Preparation tool for Windows Server 2003 Service Pack 2 Deployment](http://www.microsoft.com/downloads/details.aspx?familyid=93F20BB1-97AA-4356-8B43-9584B7E72556&displaylang=en)
 
 
@@ -280,29 +328,27 @@ also some Linux utilities which claim to
 
 Copy the extracted Windows XP Sysprep files to the following directory on
 the management node after they have been extracted:
-{panel}
-/usr/local/vcl/tools/Windows_XP/Utilities/Sysprep
-{panel}Copy the extracted Windows Server 2003 Sysprep files to the
+
+    /usr/local/vcl/tools/Windows_XP/Utilities/Sysprep
+
+Copy the extracted Windows Server 2003 Sysprep files to the
 following directory on the management node after they have been extracted:
-{panel}
-/usr/local/vcl/tools/Windows_Server_2003/Utilities/Sysprep
-{panel}
+
+    /usr/local/vcl/tools/Windows_Server_2003/Utilities/Sysprep
+
 The Sysprep directories should already exist on the management node because
 they exist the Subversion repository.&nbsp; The Sysprep directories should
 contain the following files at a minimum:
-{panel}
-\-rw-rw-r-\- 1 root root 25600 Aug 18 17:32 setupcl.exe
-\-rw-rw-r-\- 1 root root 88576 Aug 18 17:32 sysprep.exe
-{panel}
+
+    -rw-rw-r- 1 root root 25600 Aug 18 17:32 setupcl.exe
+    -rw-rw-r- 1 root root 88576 Aug 18 17:32 sysprep.exe
 
 Your Windows product keys and/or KMS server addresses need to be entered
 into the VCL database in order to capture a Windows image using
 Sysprep.&nbsp; Enter the information into the database by running the the
 following command:
 
-{panel}
-/usr/local/vcl/bin/vcld \-setup
-{panel}
+    /usr/local/vcl/bin/vcld -setup
 
 Select "Windows OS Module" and follow the prompts.
 
@@ -319,61 +365,56 @@ The drivers must be copied to the approp
 node. The VCL image capture process copies the driver directories to the
 computer before an image is captured. Drivers from multiple directories
 will be copied based on the version of Windows being captured. There are
-driver directories under *tools* for each version of Windows (Windows XP,
+driver directories under **tools** for each version of Windows (Windows XP,
 Windows Vista) and for each version group of Windows (version 5, 6). This
 allows drivers which are common to multiple versions of Windows to be
 shared in the management node tools directory structure.
 
 For example, if a chipset driver works for all versions of Windows, it can
 be saved in:
-*tools/Windows/Drivers/Chipset*
+**tools/Windows/Drivers/Chipset**
 
 If Windows XP and Windows Server 2003 both use the same network driver, it
 can be saved in:
-*tools/Windows_Version_5/Drivers/Network*
+**tools/Windows_Version_5/Drivers/Network**
 
 If a storage driver only works for Windows XP, it should be saved in:
-*tools/Windows_XP/Drivers/Storage*
+**tools/Windows_XP/Drivers/Storage**
 
 
 During the image capture process, each Windows version directory is copied
 to the computer under C:\Cygwin\home\root\VCL. The order in which the
 Windows version directories are copied goes from most general to most
 specific.&nbsp; In the example above, the order would be:
-1. *tools/Windows/Drivers/Chipset*
-1. *tools/Windows_Version_5/Drivers/Network*
-1. *tools/Windows_XP/Drivers/Storage*
+
+1. **tools/Windows/Drivers/Chipset**
+1. **tools/Windows_Version_5/Drivers/Network**
+1. **tools/Windows_XP/Drivers/Storage**
 
 The resulting directory structure on the Windows computer will be:
-* *C:\Cygwin\home\root\VCL\Drivers*
-** *\Chipset* \- driver works for all versions of windows
-** *\Network* \- driver works for Windows XP and Server 2003
-** *\Storage* \- driver only works for Windows XP
+
+* **C:\Cygwin\home\root\VCL\Drivers**
+    * **\Chipset** - driver works for all versions of windows
+    * **\Network** - driver works for Windows XP and Server 2003
+    * **\Storage** - driver only works for Windows XP
 
 The following list shows which driver files should be saved in the driver
 directories:
 
-* *tools/Windows/Drivers* \- drivers common to all versions of Windows
-** *tools/Windows_Version_5/Drivers* \- drivers used by Windows XP and
-Server 2003
-*** *tools/Windows_Version_XP/Drivers* \- drivers only used by Windows XP
-*** *tools/Windows_Version_Server_2003/Drivers* \- drivers only used by
-Windows Server 2003
-** *tools/Windows_Version_6/Drivers* \- drivers used by Windows Vista and
-Server 2008
-*** *tools/Windows_Vista/Drivers* \- drivers only used by Windows Vista
-*** *tools/Windows_Server_2008/Drivers* \- drivers only used by Windows
-Server 2008
+* **tools/Windows/Drivers** - drivers common to all versions of Windows
+    * **tools/Windows_Version_5/Drivers** - drivers used by Windows XP and Server 2003
+        * **tools/Windows_Version_XP/Drivers** - drivers only used by Windows XP
+        * **tools/Windows_Version_Server_2003/Drivers** - drivers only used by Windows Server 2003
+    * **tools/Windows_Version_6/Drivers** - drivers used by Windows Vista and Server 2008
+        * **tools/Windows_Vista/Drivers** - drivers only used by Windows Vista
+        * **tools/Windows_Server_2008/Drivers** - drivers only used by Windows Server 2008
 
 The directory structure under each Drivers directory does not matter. It is
 helpful to organize each directory by driver class, and each directory
 should be organized using the same theme.&nbsp; For example:
-* *tools/Windows_Version_XP/Drivers*
-** *Chipset*
-** *Network*
-** *Storage*
-** *Video*
-
 
-<a name="2.2ManagementNodeInstallation-"></a>
-### 
+* **tools/Windows_Version_XP/Drivers**
+    * **Chipset**
+    * **Network**
+    * **Storage**
+    * **Video**

Added: vcl/site/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.mdtext?rev=1430520&view=auto
==============================================================================
--- vcl/site/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.mdtext (added)
+++ vcl/site/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.mdtext Tue Jan  8 20:52:46 2013
@@ -0,0 +1,54 @@
+Title: 2.2 phpMyAdmin Installation & Configuration
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+<p><a href="http://www.phpmyadmin.net" class="external-link" rel="nofollow">phpMyAdmin</a> is a free and optional tool which allows <a href="http://mysql.com/" class="external-link" rel="nofollow">MySQL</a> to be administered using a web browser. It makes administering the VCL database easier. This tool can be installed on the VCL web server.</p>
+
+<h2><a name="2.2phpMyAdminInstallation%26Configuration-DownloadphpMyAdmin"></a>Download phpMyAdmin</h2>
+
+<ol>
+	<li>Check the version of PHP installed on the web server: <b>php &#45;v</b><br/>
+Use phpMyAdmin 2.x if the version of PHP is 3.x or 4.x:
+<div class="panel" style="border-width: 1px;"><div class="panelContent">
+<p>PHP 4.3.2 (cgi), Copyright (c) 1997-2003 The PHP Group</p>
+</div></div>
+<p>Use phpMyAdmin 3.x if the version of PHP is 5.x:</p>
+
+<div class="panel" style="border-width: 1px;"><div class="panelContent">
+<p>PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)</p>
+</div></div></li>
+	<li>Download the appropriate version of phpMyAdmin from: <a href="http://www.phpmyadmin.net/home_page/downloads.php" class="external-link" rel="nofollow">http://www.phpmyadmin.net/home_page/downloads.php</a></li>
+	<li>Extract the phpMyAdmin package:<br/>
+<b>tar &#45;xzf phpMyAdmin-2.11.9.6-all-languages-utf-8-only.tar.gz</b></li>
+	<li>Move the phpMyAdmin directory to the web server directory:<br/>
+
+<b>mv phpMyAdmin-2.11.9.6-all-languages-utf-8-only /var/www/html/phpmyadmin</b></li>
+	<li>Follow the installation instructions in: <b>/var/www/html/phpmyadmin/Documentation.txt</b><br/>
+<font color="#ff0000"><b>IMPORTANT:</b></font> the instructions must be followed in order to secure phpMyAdmin</li>
+</ol>
+
+
+<h2><a name="2.2phpMyAdminInstallation%26Configuration-ConfigureVCLTableRelationships"></a>Configure VCL Table Relationships</h2>
+
+<p>An SQL file is provided which will add entries to the pma_table_info table in the phpmyadmin database. These entries cause corresponding information to be displayed when you hover over a value in the VCL database.<a href="http://152.46.17.139/phpmyadmin/tbl_structure.php?db=phpmyadmin&amp;table=pma_table_info&amp;token=400c0bde21942dbd89e5d699621fe692" class="external-link" rel="nofollow">http://152.46.17.139/phpmyadmin/tbl_structure.php?db=phpmyadmin&amp;table=pma_table_info&amp;token=400c0bde21942dbd89e5d699621fe692</a></p>
+
+<ol>
+	<li>Download the following file:<br/>
+&#42;wget <a href="http://svn.apache.org/repos/asf/vcl/trunk/mysql/phpmyadmin.sql*" class="external-link" rel="nofollow">http://svn.apache.org/repos/asf/vcl/trunk/mysql/phpmyadmin.sql&#42;</a></li>
+	<li>Import the SQL file into the phpmyadmin database:<br/>
+<b>mysql phpmyadmin &lt; phpmyadmin.sql</b></li>
+</ol>
\ No newline at end of file

Propchange: vcl/site/trunk/content/confluence_export/2.2-phpmyadmin-installation-configuration.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: vcl/site/trunk/content/confluence_export/2.2-web-code-installation.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/2.2-web-code-installation.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/2.2-web-code-installation.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/2.2-web-code-installation.mdtext Tue Jan  8 20:52:46 2013
@@ -1,15 +1,17 @@
 Title: 2.2 Web Code Installation
-{excerpt}This page describes how to install and configure the frontend VCL
+
+This page describes how to install and configure the frontend VCL
 web code components including the web server prerequisites and frontend VCL
 web code. It also describes how to add local web accounts, configure LDAP
-authentication, and set the timezone correctly.{excerpt}
+authentication, and set the timezone correctly.
 
 
 <a name="2.2WebCodeInstallation-*Prerequisites*"></a>
-## *Prerequisites*
+## Prerequisites
 
 Your web server should meet the following criteria before installing the
 frontend VCL code:
+
 * Apache HTTP Server v1.3 or v2.x with SSL enabled - while VCL may run
 under another webserver capable of running PHP code, it has only been
 tested to work with Apache HTTP Server
@@ -17,19 +19,18 @@ tested to work with Apache HTTP Server
 * php modules that should be installed (depending on your Linux distro,
 some of these may be compiled in to php instead of being a separate
 module):
-** php-gd
-** php-json (if your PHP version is < 5.2, this is not required)
-** php-mcrypt
-** php-mysql
-** php-openssl
-** php-sysvsem
-** php-xml
-** php-xmlrpc
-** php-ldap (if you will be using ldap authentication)
+    * php-gd
+    * php-json (if your PHP version is < 5.2, this is not required)
+    * php-mcrypt
+    * php-mysql
+    * php-openssl
+    * php-sysvsem
+    * php-xml
+    * php-xmlrpc
+    * php-ldap (if you will be using ldap authentication)
 * If you are running RedHat or CentOS, these can be installed with
 
-    yum install httpd mod_ssl php-gd php-mcrypt php-mysql php-xml php-xmlrpc
-php-ldap
+        yum install httpd mod_ssl php-gd php-mcrypt php-mysql php-xml php-xmlrpc php-ldap
 
 * If you will be using a self-signed certificate for SSL, [this is a great HOWTO ](http://wiki.centos.org/HowTos/Https)
  explaining how to set that up on CentOS.
@@ -40,10 +41,9 @@ These may need to be installed first.
 <a name="2.2WebCodeInstallation-*InstallingVCLFrontendWebCode*"></a>
 ## *Installing VCL Frontend Web Code*
 
-1. If you haven't already done so, download and extract a copy of the latest
-release. There is a link to it under the Project Resources section on our
-wiki [home page](apache-vcl.html)
-. Look for "Current version".
+1. If you haven't already done so, download and extract a copy of the release. 
+There is a link to it on our [download page](/downloads/download.cgi).
+
 1. copy the "web" directory to a location somewhere under the web root of
 your web server:
 
@@ -51,9 +51,9 @@ your web server:
 
 1. copy/rename secrets-default.php to secrets.php
 1. modify vcl/.ht-inc/secrets.php
-1. * set $vclhost, $vcldb, $vclusername, and $vclpassword to match your
+    * set $vclhost, $vcldb, $vclusername, and $vclpassword to match your
 database setup
-1. * create random passwords for $mcryptkey, $mcryptiv, and $pemkey -
+    * create random passwords for $mcryptkey, $mcryptiv, and $pemkey -
 $mcryptiv must be 8 hex characters
 1. run the genkeys.sh script from within vcl/.ht-inc and give it $pemkey
 from secrets.php as the passphrase (3 times, copy/paste is a good idea
@@ -62,43 +62,44 @@ here)
 1. modify vcl/.ht-inc/conf.php to match your site - COOKIEDOMAIN needs to be
 the domain name your web server is using, or left blank if you are
 accessing it by IP only.
-\**You really need to modify every entry in the "Things in this section
-must be modified" part of the file.*\*
-1. \**NOTICE*\* JpGraph 2.x is no longer available.  JpGraph 3.x is released
+**You really need to modify every entry in the "Things in this section
+must be modified" part of the file.**
+1. **NOTICE** JpGraph 2.x is no longer available.  JpGraph 3.x is released
 under a dual license. QPL 1.0 (Qt Free Licensee).  Free for non-commercial,
 open-source or educational use (JpGraph Professional License for commercial
 use).  If you are planning to use this for commercial use and don't want to
 pay for JpGraph, you can safely skip this step with the only side effect of
 not being able to display a few graphs on the statistics page.
 Download JpGraph from [http://www.aditus.nu/jpgraph/jpdownload.php](http://www.aditus.nu/jpgraph/jpdownload.php)
-1. * download the 3.x series, extract it, and copy the src directory from it
+   * download the 3.x series, extract it, and copy the src directory from it
 to vcl/.ht-inc/jpgraph
 1. make the .ht-inc/maintenance directory writable by the web server user -
 i.e. if the httpd process is running as user 'apache' run 'chown apache
 .ht-inc/maintenance'
 1. open the testsetup.php page in a web browser
-1. * i.e. if you set up your site to be [https://my.server.org/vcl/](https://my.server.org/vcl/)
- open [https://my.server.org/vcl/testsetup.php]
+   * i.e. if you set up your site to be **https://my.server.org/vcl/** open
+**https://my.server.org/vcl/testsetup.php**
 1. debug any issues reported by testsetup.php
 1. now, open the index.php page in your browser
 1. select Local Account and use 'admin' as the user and 'adminVc1passw0rd'
 as the password
-\**Now would be a good time to change the password from the default by
+
+    **Now would be a good time to change the password from the default by
 going to User Preferences
 1. click the "Management Nodes" link
 1. enter the hostname and IP of your management node
 1. click Add
 1. fill in these additional required fields:
-1. * SysAdmin Email Address - error emails will be sent to this address
-1. * Install Path - this is parent directory under which image files will be
+   * SysAdmin Email Address - error emails will be sent to this address
+   * Install Path - this is parent directory under which image files will be
 stored - only required if doing bare metal installs or using VMWare with
 local disks
-1. * End Node SSH Identity Key Files - probably just enter "/etc/vcl/vcl.key"
+   * End Node SSH Identity Key Files - probably just enter "/etc/vcl/vcl.key"
 1. optionally, fill in these unrequired fields:
-1. * Address for Shadow Emails - End users are sent various emails about the
+   * Address for Shadow Emails - End users are sent various emails about the
 status of their reservations. If this field is configured, copies of all of
 those emails will be sent to this address.
-1. * Public NIC configuration method - this defaults to Dynamic DHCP - if
+   * Public NIC configuration method - this defaults to Dynamic DHCP - if
 DHCP is not available for the public interface of your nodes, you can set
 this to Static. Then, the IP configuration on the nodes will be manually
 set using Public Netmask, Public Gateway, Public DNS Server, and the IP
@@ -121,7 +122,7 @@ Next Step: [Management Node Installation
 
 
 <a name="2.2WebCodeInstallation-*Addingextralocalaccounts*"></a>
-## *Adding extra local accounts*
+## Adding extra local accounts
 
 Additional local accounts can now be added using the backend code. After
 you have finished the backend install, run

Modified: vcl/site/trunk/content/confluence_export/adding-ldap-authentication.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/adding-ldap-authentication.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/adding-ldap-authentication.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/adding-ldap-authentication.mdtext Tue Jan  8 20:52:46 2013
@@ -1,4 +1,5 @@
 Title: Adding LDAP Authentication
+
 <a name="AddingLDAPAuthentication-PrerequisitesforyourLDAPserver:"></a>
 ### Prerequisites for your LDAP server:
 * enable SSL on your LDAP server
@@ -21,15 +22,14 @@ to be added to /etc/pki/tls/certs/ca-bun
 generate the lines that need to be added to the ca-bundle.crt file.
 * After adding the certificate, restart httpd:
 
-    service httpd restart
+        service httpd restart
 
 * You can verify that the certificate is properly installed using this
 command:
 
-    openssl s_client -showcerts -CAfile /etc/pki/tls/certs/ca-bundle.crt
--connect your.ldap.server.here:636
+        openssl s_client -showcerts -CAfile /etc/pki/tls/certs/ca-bundle.crt -connect your.ldap.server.here:636
 
-If you see "Verify return code: 0 (ok)" at the end of the output, then it
+    If you see "Verify return code: 0 (ok)" at the end of the output, then it
 is installed correctly. If you see a different return code, then you'll
 need to work through the problem.
 * You may need to add a line to /etc/openldap/ldap.conf to point to the
@@ -50,10 +50,10 @@ following to add the affiliation, replac
 chose. Take note of the id from the 2nd SQL statement as you will need it
 later. It is the affiliationid for this affiliation.
 
-    mysql vcl
-    INSERT INTO affiliation (name) VALUES ('EXAMPLE');
-    SELECT id FROM affiliation WHERE name = 'EXAMPLE';
-    exit
+        mysql vcl
+        INSERT INTO affiliation (name) VALUES ('EXAMPLE');
+        SELECT id FROM affiliation WHERE name = 'EXAMPLE';
+        exit
 
 * Edit conf.php and search for "EXAMPLE1 LDAP"
 * Uncomment the "EXAMPLE1 LDAP" section by removing the '/\*' before it and
@@ -62,94 +62,83 @@ the '\*/' at the end of 'to use this log
 at NCSU, it is 'NCSU LDAP'. This string is what users will see where they
 select the authentication mechanism to use when logging in.
 * Modify the following fields:
-** server - this is the hostname of your LDAP server
-** binddn - typically, you'll want to use the base DN of your LDAP server;
+    * server - this is the hostname of your LDAP server
+    * binddn - typically, you'll want to use the base DN of your LDAP server;
 for Active Directory, this is usually dc= for each of your domain name
 components. For example, your your domain name was ad.example.org, it would
 be "dc=ad,dc=example,dc=org"
-** userid - this is a string that is added to the userid a user enters on
+    * userid - this is a string that is added to the userid a user enters on
 the login page. Place a '%s' where the entered userid should go. Some
 examples are:
-*** %s@example.org
-*** %s@ad.example.org
-*** uid=%s,ou=accounts,dc=example,dc=org'
-** unityid - this is the ldap field that contains a user's login id (for
+        * %s@example.org
+        * %s@ad.example.org
+        * uid=%s,ou=accounts,dc=example,dc=org'
+    * unityid - this is the ldap field that contains a user's login id (for
 Active Directory, this is usually sAMAccountName)
-** firstname - this is the ldap field that contains a user's first name
-** lastname - this is the ldap field that contains a user's last name
-** email - this is the ldap field that contains a user's email address
-** defaultemail - if an email address is not provided by the ldap server,
+    * firstname - this is the ldap field that contains a user's first name
+    * lastname - this is the ldap field that contains a user's last name
+    * email - this is the ldap field that contains a user's email address
+    * defaultemail - if an email address is not provided by the ldap server,
 this will be appended to the end of the userid to create an email address.
 In this case, email notifications will be disabled by default.
-** masterlogin - this is the vcllookup account referred to in the
+    * masterlogin - this is the vcllookup account referred to in the
 "Prerequisites for your LDAP server" section - comment out this line if
 using anonymous binds
-** masterpwd - password for the masterlogin account - comment out this line
+    * masterpwd - password for the masterlogin account - comment out this line
 if using anonymous binds
-** affiliationid - this is the id from the SELECT statement in the first
+    * affiliationid - this is the id from the SELECT statement in the first
 step
-** help - this is some text that will show up on the page where users
+    * help - this is some text that will show up on the page where users
 select the authentication method explaining why they would select this
 option
 * Next, there are 6 arrays that would need to be modified, but can be
 replaced with a block of code.
 * Delete the following lines:
 
-    $affilValFunc = array(1 => create_function('', 'return 0;'),
-    		      /*3 => "validateLDAPUser",*/
-    );
-    
-    $affilValFuncArgs = array(/*3 => 'EXAMPLE1 LDAP',*/
-    );
-    
-    $addUserFunc = array(1 => create_function('', 'return 0;'),
-    		     /*3 => 'addLDAPUser',*/
-    );
-    
-    $addUserFuncArgs = array(/*3 => 'EXAMPLE1 LDAP',*/
-    );
-    
-    $updateUserFunc = array(1 => create_function('', 'return 0;'),
-    			/*3 => 'updateLDAPUser',*/
-    );
-    
-    $updateUserFuncArgs = array(/*3 => 'EXAMPLE1 LDAP',*/
-    );
+        $affilValFunc = array(1 => create_function('', 'return 0;'),
+        		      /*3 => "validateLDAPUser",*/
+        );
+        
+        $affilValFuncArgs = array(/*3 => 'EXAMPLE1 LDAP',*/
+        );
+        
+        $addUserFunc = array(1 => create_function('', 'return 0;'),
+        		     /*3 => 'addLDAPUser',*/
+        );
+        
+        $addUserFuncArgs = array(/*3 => 'EXAMPLE1 LDAP',*/
+        );
+        
+        $updateUserFunc = array(1 => create_function('', 'return 0;'),
+        			/*3 => 'updateLDAPUser',*/
+        );
+        
+        $updateUserFuncArgs = array(/*3 => 'EXAMPLE1 LDAP',*/
+        );
 
 and replace them with
 
-    $affilValFunc = array();
-    $affilValFuncArgs = array();
-    $addUserFunc = array();
-    $addUserFuncArgs = array();
-    $updateUserFunc = array();
-    $updateUserFuncArgs = array();
-    foreach($authMechs as $key => $item) {
-       if($item['type']
- == 'ldap') {
-          $affilValFunc[$item['affiliationid']
-] = 'validateLDAPUser';
-          $affilValFuncArgs[$item['affiliationid']
-] = $key;
-          $addUserFunc[$item['affiliationid']
-] = 'addLDAPUser';
-          $addUserFuncArgs[$item['affiliationid']
-] = $key;
-          $updateUserFunc[$item['affiliationid']
-] = 'updateLDAPUser';
-          $updateUserFuncArgs[$item['affiliationid']
-] = $key;
-       }
-       elseif($item['type']
- == 'local') {
-          $affilValFunc[$item['affiliationid']
-] = create_function('', 'return 0;');
-          $addUserFunc[$item['affiliationid']
-] = create_function('', 'return 0;');
-          $updateUserFunc[$item['affiliationid']
-] = create_function('', 'return 0;');
-       }
-    }
+        $affilValFunc = array();
+        $affilValFuncArgs = array();
+        $addUserFunc = array();
+        $addUserFuncArgs = array();
+        $updateUserFunc = array();
+        $updateUserFuncArgs = array();
+        foreach($authMechs as $key => $item) {
+           if($item['type'] == 'ldap') {
+              $affilValFunc[$item['affiliationid']] = 'validateLDAPUser';
+              $affilValFuncArgs[$item['affiliationid']] = $key;
+              $addUserFunc[$item['affiliationid']] = 'addLDAPUser';
+              $addUserFuncArgs[$item['affiliationid']] = $key;
+              $updateUserFunc[$item['affiliationid']] = 'updateLDAPUser';
+              $updateUserFuncArgs[$item['affiliationid']] = $key;
+           }
+           elseif($item['type'] == 'local') {
+              $affilValFunc[$item['affiliationid']] = create_function('', 'return 0;');
+              $addUserFunc[$item['affiliationid']] = create_function('', 'return 0;');
+              $updateUserFunc[$item['affiliationid']] = create_function('', 'return 0;');
+           }
+        }
 
 * uncomment the require_once line for ldapauth.php toward the bottom of the
 file
@@ -160,11 +149,11 @@ If your LDAP server has users in multipl
 each user must be looked up before doing a bind to the LDAP server to
 authenticate the user. In this case, you'll need to modify
 authentication.php.
+
 * edit authenciation.php
 * search for ldapLogin
 * search for EXAMPLE1 LDAP in the function
-* uncomment the block of code it is contained in by removing the '/\*' at the beginning of the line containing 'EXAMPLE1 LDAP', and removing the '\*/' at the end of the else that is before '$ldapuser = sprintf($authMechs[$authtype]($authtype.html)
-['userid'], $userid);'
+* uncomment the block of code it is contained in by removing the '/\*' at the beginning of the line containing 'EXAMPLE1 LDAP', and removing the '\*/' at the end of the else that is before '$ldapuser = sprintf($authMechs[$authtype]['userid'], $userid);'
 * Look for the line containing 'cn=$userid'. If you use 'cn' to look up
 userids in your LDAP server, the line is fine as is. If you use something
 else, such as 'uid', change 'cn' to 'uid' or whatever is used on your LDAP

Added: vcl/site/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.mdtext?rev=1430520&view=auto
==============================================================================
--- vcl/site/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.mdtext (added)
+++ vcl/site/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.mdtext Tue Jan  8 20:52:46 2013
@@ -0,0 +1,89 @@
+Title: Adding support for partimage and partimage-ng to xCAT 2.x (unofficial)
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+<p>This is how I added support for partimage/partimage-ng to xCAT 2.x</p>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-Overview"></a>Overview</h2>
+
+<p>The method I used was based on a suggestion by Egan Ford.  I created an xCAT plugin to handle the imaging commands.  That plugin sets the node to boot a stateless image and configures a certain postscript to run that handles the image capture/restore.</p>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-partimageng.pmxCATplugin"></a>partimageng.pm xCAT plugin</h2>
+
+<p>First, I created an xCAT plugin to handle 2 nodeset commands for os type <b>image</b>: <em>install</em> and <em>image</em>.  This allows you to set the os type for a node to <b>image</b> and then run one of</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+
+<pre class="code-java">
+nodeset &lt;node&gt; image
+nodeset &lt;node&gt; install
+</pre>
+</div></div>
+<p>which will cause an image of the node to be captured or installed the next time the node is booted.  The architecture for the node must always be set to x86 for this, but it will handle imaging/restoring both x86 and x86_64.</p>
+
+<p>To use it, <a href="https://svn.apache.org/repos/asf/vcl/sandbox/xcat2partimageng/partimageng.pm" class="external-link" rel="nofollow">download</a> it from our SVN repository and put it in lib/perl/xCAT_plugin under your XCATROOT directory.</p>
+
+<p>partimageng.pm requires a kickstart template file to be installed in your XCATROOT as share/xcat/install/image/default.tmpl. It should contain a single line with these contents:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+#INCLUDE:../scripts/post.rh#
+</pre>
+</div></div>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-partimagengpostscript"></a>partimageng postscript</h2>
+
+<p>The partimageng.pm xCAT plugin configures the node to boot a stateless image and then to run the partimageng postscript.  This postscript handles the image capture/restore.  I did it all in a postscript to keep from having to rebuild the stateless image each time the capture/restore code needed to be modified.  The postscript can handle both partimage and partimage-ng formats. I initially only supported partimage-ng, but then realized that presented a compatibility problem where all of our previous images would have to be converted. There is a flag in the script to set which of the two applications gets used to create images that can be manually modified or passed in as a kernel parameter (I haven't set up a way for the partimageng.pm plugin to pass that kernel parameter yet though). Also, it determines what drive to image/install based on some stuff in /dev and /proc. The device can be specified as a kernel parameter, but again, this hasn't been added to the xCAT plugin.
  Right now, it only works with /dev/sda, /dev/sdb, /dev/hda, or /dev/hdb.</p>
+
+<p><a href="https://svn.apache.org/repos/asf/vcl/sandbox/xcat2partimageng/partimageng" class="external-link" rel="nofollow">Download</a> it from our SVN repository and put it in your xCAT postscripts directory.</p>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-listener.py"></a>listener.py</h2>
+
+<p>This is a script I took from what was already part of xCAT that provides a way for xCAT's nodestat command to get the status of an install. I modified it to give the status of a partimage-ng or partimage install.</p>
+
+<p>It needs to go in a directory I came up with to put the root image and required files. It is under your install path, for me, that is /install, so you need to put <a href="https://svn.apache.org/repos/asf/vcl/sandbox/xcat2partimageng/listener.py" class="external-link" rel="nofollow">listener.py</a> at /install/image/x86/installer_files</p>
+
+<p>Also make sure to make listener.py executable:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">
+
+chmod +x listener.py
+</pre>
+</div></div>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-statelessimage"></a>stateless image</h2>
+
+<p>This is the harder part. The images I have were built for IBM HS20, HS21, and HS22 blades. If you have other hardware, you may be able to use an existing kernel you have and update the kernel modules in the images I created. If that doesn't work, you'll need to create your own images. Since I don't have any notes on how I created them, I'll wait until someone needs help doing that to figure it out again (send a message to the vcl-user list). The short answer is to look at the xCAT docs on building a stateless image for your hardware. These images default to using eth0 as the installation NIC. To use a different NIC, set 'installnic' in the noderes table to the desired NIC. The root image contains the partimage and partimage-ng binaries.</p>
+
+<p>There are three parts:</p>
+<ul>
+	<li><a href="http://people.apache.org/~jfthomps/partimageng_xCAT2x/vmlinuz" class="external-link" rel="nofollow">kernel - vmlinuz</a></li>
+	<li><a href="http://people.apache.org/~jfthomps/partimageng_xCAT2x/initrd.img" class="external-link" rel="nofollow">initial RAM disk - initrd.img</a></li>
+
+	<li><a href="http://people.apache.org/~jfthomps/partimageng_xCAT2x/rootimg.gz" class="external-link" rel="nofollow">root image - rootimg.gz</a></li>
+</ul>
+
+
+<p>Put vmlinuz and initrd.img at /tftpboot/xcat/image/x86.<br/>
+Put rootimg.gz the same place you put the listener.py script (/install/image/x86/installer_files for me)</p>
+
+<h2><a name="Addingsupportforpartimageandpartimage-ngtoxCAT2.x%28unofficial%29-ConfigurexCAT"></a>Configure xCAT</h2>
+
+<p>The installer image uses NFS to mount the image store. In the past, it mounted the management node.  It has now been updated to be able to mount any NFS export available on the install network.  Two additional items need to be added to the xCAT site table:</p>
+
+<ul>
+	<li>IMAGELIBSERVER - this is the hostname or IP of the NFS server</li>
+	<li>IMAGELIBINSTALLDIR - this is the directory being exported by the NFS server</li>
+</ul>

Propchange: vcl/site/trunk/content/confluence_export/adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-unofficial.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: vcl/site/trunk/content/confluence_export/further-steps-if-using-only-vmware.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/further-steps-if-using-only-vmware.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/further-steps-if-using-only-vmware.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/further-steps-if-using-only-vmware.mdtext Tue Jan  8 20:52:46 2013
@@ -1,4 +1,5 @@
 Title: Further steps if using only VMWare
+
 If you are using standalone VMWare servers (i.e. ones that VCL did not
 deploy using xCAT), you first need to add the VMWare servers; then, you
 need to add the virtual machines. You can either add them individually
@@ -18,17 +19,17 @@ same thing but checking the "Add Multipl
 1. select the "Add Single Computer" radio button
 1. click Submit
 1. fill in
-1. * Hostname
-1. * IP Address
-1. * State - vmhostinuse - double check this because you will not be able to
+ * Hostname
+ * IP Address
+ * State - vmhostinuse - double check this because you will not be able to
 change it later
-1. * owner (admin@Local)
-1. * RAM
-1. * Proc Speed
-1. * Network Speed
-1. * Type - blade
-1. * Provisioning Engine - xCAT 2.x Provisioning
-1. * click the checkbox under "allcomputers"
+ * owner (admin@Local)
+ * RAM
+ * Proc Speed
+ * Network Speed
+ * Type - blade
+ * Provisioning Engine - xCAT 2.x Provisioning
+ * click the checkbox under "allcomputers"
 1. click Confirm Computer
 1. click Submit
 1. select a VM Host Profile to use with this host - you can edit the VM Host
@@ -51,26 +52,26 @@ virtual machines.
 1. select the "Add Multiple Computers" radio button
 1. click Submit
 1. fill in
-1. * Hostname - the hostnames of all the computers must have a numerical part
+ * Hostname - the hostnames of all the computers must have a numerical part
 that is sequential, use a % as a placeholder where that part would be
-1. * Start value - the first number of the numerical part of the hostname
-1. * End value - the last number of the numerical part of the hostname
-1. * Start IP Address - if using static public addresses, the IP addresses
+ * Start value - the first number of the numerical part of the hostname
+ * End value - the last number of the numerical part of the hostname
+ * Start IP Address - if using static public addresses, the IP addresses
 must be sequential; enter the first address here; if using DHCP, just enter
 something like 1.1.1.1
-1. * End IP address - the last IP address of the sequence; if using DHCP,
+ * End IP address - the last IP address of the sequence; if using DHCP,
 you'll need to enter something that would work out to the last address
 relative to Start IP Address (i.e. if adding 3 computers, use 1.1.1.1 for
 start and 1.1.1.3 for end)
-1. * State - vmhostinuse - double check this because you will not be able to
+ * State - vmhostinuse - double check this because you will not be able to
 change it later
-1. * Owner - owner of the computer
-1. * RAM
-1. * Processor Speed
-1. * Network Speed
-1. * Type - blade
-1. * Provisioning Engine - xCAT 2.x
-1. * check allComputers
+ * Owner - owner of the computer
+ * RAM
+ * Processor Speed
+ * Network Speed
+ * Type - blade
+ * Provisioning Engine - xCAT 2.x
+ * check allComputers
 1. click Confirm Computers
 1. click Submit
 1. select a VM Host Profile to use with these hosts - you can edit the VM
@@ -84,38 +85,37 @@ Host Profile later if needed
 1. select the "Add Multiple Computers" radio button
 1. click Submit
 1. fill in
-1. * Hostname - the hostnames of all the computers must have a numerical part
+ * Hostname - the hostnames of all the computers must have a numerical part
 that is sequential, use a % as a placeholder where that part would be
-1. * Start value - the first number of the numerical part of the hostname
-1. * End value - the last number of the numerical part of the hostname
-1. * Start IP Address - if using static public addresses, the IP addresses
+ * Start value - the first number of the numerical part of the hostname
+ * End value - the last number of the numerical part of the hostname
+ * Start IP Address - if using static public addresses, the IP addresses
 must be sequential; enter the first address here; if using DHCP, just enter
 something like 1.1.1.1
-1. * End IP address - the last IP address of the sequence; if using DHCP,
+ * End IP address - the last IP address of the sequence; if using DHCP,
 you'll need to enter something that would work out to the last address
 relative to Start IP Address (i.e. if adding 3 computers, use 1.1.1.1 for
 start and 1.1.1.3 for end)
-1. * Start private IP Address - similar to Start IP Address, but for the
+ * Start private IP Address - similar to Start IP Address, but for the
 private side
-1. * End private IP Address - similar to the End IP Address but for the
+ * End private IP Address - similar to the End IP Address but for the
 private side
-1. * Start MAC Address - if mac addresses are sequential, with the first one
+ * Start MAC Address - if mac addresses are sequential, with the first one
 being the private MAC address for the first computer, the second one being
 the public MAC address for the first computer, the third one being the
 private MAC address of the second computer, etc, you can enter the first
 one here and then have the option of generating data to add to your
 dhcpd.conf file later in the process.
-{color:#ff0000}{*}Important{*}{color}: for VMware VMs, the MAC addresses
+**Important**: for VMware VMs, the MAC addresses
 you choose must be in the range&nbsp;00:50:56:00:00:00 - 00:50:56:3F:FF:FF
-
-1. * State - maintenance
-1. * Owner - owner of the computer
-1. * RAM
-1. * Processor Speed
-1. * Network Speed
-1. * Type - virtualmachine
-1. * Provisioning Engine - VMware
-1. * check "All VM Computers" and newvmimages
+ * State - maintenance
+ * Owner - owner of the computer
+ * RAM
+ * Processor Speed
+ * Network Speed
+ * Type - virtualmachine
+ * Provisioning Engine - VMware
+ * check "All VM Computers" and newvmimages
 1. click Confirm Computers
 1. click Submit
 1. If you filled in the private address fields and the Start MAC Address,

Modified: vcl/site/trunk/content/confluence_export/further-steps-if-using-xcat.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/further-steps-if-using-xcat.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/further-steps-if-using-xcat.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/further-steps-if-using-xcat.mdtext Tue Jan  8 20:52:46 2013
@@ -1,4 +1,5 @@
 Title: Further steps if using xCAT
+
 You can initially add individual computers or multiple computers all
 together. After you have added at least one computer, you will need to go
 to Manage Computers \-> Edit Computer Information to additional ones.
@@ -26,24 +27,24 @@ started checking in, you should be able 
 1. select the "Add Multiple Computers" radio button
 1. click Submit
 1. fill in
-1. * Hostname - the hostnames of all the computers must have a numerical part
+ * Hostname - the hostnames of all the computers must have a numerical part
 that is sequential, use a % as a placeholder where that part would be
-1. * Start value - the first number of the numerical part of the hostname
-1. * End value - the last number of the numerical part of the hostname
-1. * Start IP Address - if using static public addresses, the IP addresses
+ * Start value - the first number of the numerical part of the hostname
+ * End value - the last number of the numerical part of the hostname
+ * Start IP Address - if using static public addresses, the IP addresses
 must be sequential; enter the first address here; if using DHCP, just enter
 something like 1.1.1.1
-1. * End IP address - the last IP address of the sequence; if using DHCP,
+ * End IP address - the last IP address of the sequence; if using DHCP,
 you'll need to enter something that would work out to the last address
 relative to Start IP Address (i.e. if adding 3 computers, use 1.1.1.1 for
 start and 1.1.1.3 for end)
-1. * Owner - owner of the computer
-1. * RAM
-1. * Processor Speed
-1. * Network Speed
-1. * Type - blade
-1. * Provisioning Engine - xCAT 2.x
-1. * check allComputers and newimages
+ * Owner - owner of the computer
+ * RAM
+ * Processor Speed
+ * Network Speed
+ * Type - blade
+ * Provisioning Engine - xCAT 2.x
+ * check allComputers and newimages
 1. click Confirm Computer
 1. click Submit (don't worry about the fact that the computers you just
 added aren't listed after clicking Submit)

Modified: vcl/site/trunk/content/confluence_export/missing_from_export.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/missing_from_export.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/missing_from_export.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/missing_from_export.mdtext Tue Jan  8 20:52:46 2013
@@ -1,26 +1,45 @@
 The following pages were not properly exported and need to be manually copied from Confluence:
 
-2.2-phpmyadmin-installation-&-configuration.mdtext
-adding-support-for-partimage-and-partimage-ng-to-xcat-2.x-(unofficial).mdtext
 administrator\'s-faq.mdtext
+
 current-&-future-development-topics.mdtext
+
 how-to\'s.mdtext
+
 install-&-configure-cygwin-sshd.mdtext
+
 meeting-&-conference-call-notes.mdtext
+
 phpmyadmin-installation-&-configuration.mdtext
+
 place-holder-for-vcl-2.4-(unreleased).mdtext
+
 resource-grouping-&-mapping.mdtext
+
 upgrade-from-previous-version-(2.1-to-2.2.1).mdtext
+
 upgrade-from-previous-version-(2.1-to-2.3).mdtext
+
 upgrade-from-previous-version-(2.2.1-to-2.3).mdtext
+
 upgrade-from-previous-version-(2.2-to-2.2.1).mdtext
+
 upgrade-from-previous-version-(2.2-to-2.3).mdtext
+
 vcl-2.2.1-phpmyadmin-installation-&-configuration.mdtext
+
 vcl-2.3-phpmyadmin-installation-&-configuration.mdtext
+
 vmware-configuration-(2.2.1-and-below).mdtext
+
 database.mdtext
+
 apache-vcl-community.mdtext
+
 code-documentation.mdtext
+
 design-considerations.mdtext
+
 development-environment-tips.mdtext
-development.mdtext
+
+development.mdtext
\ No newline at end of file

Modified: vcl/site/trunk/content/confluence_export/upgrade-from-previous-version.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/upgrade-from-previous-version.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/upgrade-from-previous-version.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/upgrade-from-previous-version.mdtext Tue Jan  8 20:52:46 2013
@@ -1,10 +1,11 @@
 Title: Upgrade From Previous Version
+
 This file provides information on how to upgrade from VCL 2.1 to VCL 2.2.
 Please note it only applies for the upgrade from 2.1 to 2.2, this may or
 may not work for other versions.
 
 <a name="UpgradeFromPreviousVersion-*Thebasicstepsthatwillbeperformed*"></a>
-## *The basic steps that will be performed*
+## The basic steps that will be performed
 
 * Download and Extract 2.2 code
 * Shutdown httpd and vcld services
@@ -17,48 +18,48 @@ changes
 * Restart vcld service
 
 <a name="UpgradeFromPreviousVersion-*DownloadandExtract2.2code*"></a>
-## *Download and Extract 2.2 code*
+## Download and Extract 2.2 code
 
-1. follow instructions on [VCL:VCL 2.2](vcl:vcl-2.2.html)
+1. follow instructions on [VCL 2.2](vcl-2.2.html)
  Release page to download and verify apache-VCL-2.2-incubating.tar.bz2 and
 put in in /root
 1. extract VCL 2.2 code
 
-    tar xjf apache-VCL-2.2-incubating.tar.bz2
+        tar xjf apache-VCL-2.2-incubating.tar.bz2
 
 
 
 <a name="UpgradeFromPreviousVersion-*Shutdownservices*"></a>
-## *Shutdown services*
+## Shutdown services
 
 Shutdown the httpd and vcld services
 
-    service httpd stop or /etc/init.d/httpd stop
-    service vcld stop or /etc/init.d/vcld stop
+        service httpd stop or /etc/init.d/httpd stop
+        service vcld stop or /etc/init.d/vcld stop
 
 
 <a name="UpgradeFromPreviousVersion-*Createabackupofvcldatabase*"></a>
-## *Create a backup of vcl database*
+## Create a backup of vcl database
 
 We will create a backup of the vcl database. This will provide a restore
 point if necessary.
 
 
-    mysqldump vcl > ~/vcl-pre2.2-upgrade.sql
+        mysqldump vcl > ~/vcl-pre2.2-upgrade.sql
 
 
 <a name="UpgradeFromPreviousVersion-*Updatemysqlschema*"></a>
-## *Update mysql schema*
+## Update mysql schema
 
 This step updates the mysql schema.
 
 
-    cd /root/apache-VCL-2.2-incubating
-    mysql vcl < mysql/update-2.2.sql
+        cd /root/apache-VCL-2.2-incubating
+        mysql vcl < mysql/update-2.2.sql
 
 
 <a name="UpgradeFromPreviousVersion-*Updatewebcode*"></a>
-## *Update web code*
+## Update web code
 
 This step we will move the 2.1 web directory out of the way, so we can copy
 in the new web code base. After copying in the new code, we will migrate
@@ -68,34 +69,34 @@ replace /var/www/html/vcl with your vcl 
 
 1. copy your old code out of the way
 
-    cd /var/www/html
-    mv vcl ~/vcl_2.1_web
+        cd /var/www/html
+        mv vcl ~/vcl_2.1_web
 
 1. copy the new code in place
 
-    cd /root/apache-VCL-2.2-incubating
-    cp -r web /var/www/html/vcl
+        cd /root/apache-VCL-2.2-incubating
+        cp -r web /var/www/html/vcl
 
 1. copy your 2.1 config files
 
-    cd ~/vcl_2.1_web/.ht-inc
-    cp conf.php secrets.php pubkey.pem keys.pem /var/www/html/vcl/.ht-inc
+        cd ~/vcl_2.1_web/.ht-inc
+        cp conf.php secrets.php pubkey.pem keys.pem /var/www/html/vcl/.ht-inc
 
 1. make /var/www/html/vcl/.ht-inc/maintenance writable by the web server -
 if httpd on your server is running as the user apache:
 
-    chown apache /var/www/html/vcl/.ht-inc/maintenance
+        chown apache /var/www/html/vcl/.ht-inc/maintenance
 
 1. add the following new entries to conf.php - You can copy them in from
 .ht-inc/conf-default.php. Descriptions of each item can also be found in
 conf-default.php
-1. * date_default_timezone_set('America/New_York');
-1. * $blockNotifyUsers = "adminuser@example.org";
-1. * define("SCHEDULER_ALLOCATE_RANDOM_COMPUTER", 0);
-1. * define("DOCUMENTATIONURL", "https://cwiki.apache.org/VCLDOCS/");
-1. * define("USEFILTERINGSELECT", 1);
-1. * define("FILTERINGSELECTTHRESHOLD", 1000);
-1. * define("DEFAULTTHEME", 'default');
+ * date_default_timezone_set('America/New_York');
+ * $blockNotifyUsers = "adminuser@example.org";
+ * define("SCHEDULER_ALLOCATE_RANDOM_COMPUTER", 0);
+ * define("DOCUMENTATIONURL", "https://cwiki.apache.org/VCLDOCS/");
+ * define("USEFILTERINGSELECT", 1);
+ * define("FILTERINGSELECTTHRESHOLD", 1000);
+ * define("DEFAULTTHEME", 'default');
 
 <a name="UpgradeFromPreviousVersion-Restarthttpdservice"></a>
 ## Restart httpd service
@@ -104,38 +105,38 @@ conf-default.php
 
 
 <a name="UpgradeFromPreviousVersion-*Updatemanagementnodecode*"></a>
-## *Update management node code*
+## Update management node code
 
 This step will move the 2.1 vcl code base out of the way, so we can cleanly
 copy in the new management node(MN) code.
 
 1. Copy 2.1 code base to a backup location
 
-    cd <your vcl MN code root path>
-    ie. cd /usr/local/
-    cp -r vcl ~/vcl_2.1_managementnode
+        cd <your vcl MN code root path>
+        ie. cd /usr/local/
+        cp -r vcl ~/vcl_2.1_managementnode
 
 1. Copy in the 2.2 code base to /usr/local, copying in should preserve any
 drivers or other files you've added.
 
-    /bin/cp -r /root/apache-VCL-2.2-incubating/managementnode/* /usr/local/vcl
+        /bin/cp -r /root/apache-VCL-2.2-incubating/managementnode/* /usr/local/vcl
 
 1. Make changes related to vcld.conf settings
-1. # Open VCL web interface
-1. # Go to Management Nodes
-1. # Select Edit Management Node Information
-1. # Select Edit.
-1. # Set any relevant fields:
-1. # SysAdmin Email Address(es) - comma delimited list of vcl admin email
+ * Open VCL web interface
+ * Go to Management Nodes
+ * Select Edit Management Node Information
+ * Select Edit.
+ * Set any relevant fields:
+ * SysAdmin Email Address(es) - comma delimited list of vcl admin email
 addresses
-1. # Address for Shadow Emails - a shared mail box, optional it receives
+ * Address for Shadow Emails - a shared mail box, optional it receives
 email of all notifications
-1. # Public NIC configuration method - Defines what type of NIC configuration
+ * Public NIC configuration method - Defines what type of NIC configuration
 is used, options are dynamic DHCP, Manual DHCP, or static
-1. # End Node SSH Identity Key Files
+ * End Node SSH Identity Key Files
 
 <a name="UpgradeFromPreviousVersion-Restartvcldservice"></a>
 ## Restart vcld service
 
-    service vcld start or /etc/init.d/vcld start
+        service vcld start or /etc/init.d/vcld start
 

Modified: vcl/site/trunk/content/confluence_export/vcl-2.2.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/confluence_export/vcl-2.2.mdtext?rev=1430520&r1=1430519&r2=1430520&view=diff
==============================================================================
--- vcl/site/trunk/content/confluence_export/vcl-2.2.mdtext (original)
+++ vcl/site/trunk/content/confluence_export/vcl-2.2.mdtext Tue Jan  8 20:52:46 2013
@@ -1,17 +1,6 @@
 Title: VCL 2.2
-<a name="VCL2.2-TableofContents"></a>
-## Table of Contents
-   * [Download links](#VCL2.2-Downloadlinks)
-   * [Release Notes](#VCL2.2-ReleaseNotes)
-         * [I. Intro and Description](#VCL2.2-I.IntroandDescription)
-         * [II. VCL Roadmap](#VCL2.2-II.VCLRoadmap)
-         * [III. Getting Involved in the ASF VCL Community](#VCL2.2-III.GettingInvolvedintheASFVCLCommunity)
-         * [IV. How to Submit Bugs and Feature Requests](#VCL2.2-IV.HowtoSubmitBugsandFeatureRequests)
-   * [Change Log](#VCL2.2-ChangeLog)
-         * [Bug](#VCL2.2-Bug)
-         * [Improvement](#VCL2.2-Improvement)
-         * [New Feature](#VCL2.2-NewFeature)
-         * [Task](#VCL2.2-Task)
+
+[TOC]
 
 <a name="VCL2.2-Downloadlinks"></a>
 ## Download links
@@ -22,38 +11,37 @@ downloading it *make sure* you verify it
 GPG signature (sums and signature files should be downloaded directly from
 Apache, not from mirrors).
 
-[Download ASF VCL 2.2](http://www.apache.org/dyn/closer.cgi/incubator/vcl/apache-VCL-2.2-incubating.tar.bz2)
-[GPG Signature](http://www.apache.org/dist/incubator/vcl/apache-VCL-2.2-incubating.tar.bz2.asc)
-[MD5 Sum](http://www.apache.org/dist/incubator/vcl/apache-VCL-2.2-incubating.tar.bz2.md5)
-[SHA1 Sum](http://www.apache.org/dist/incubator/vcl/apache-VCL-2.2-incubating.tar.bz2.sha1)
-[VCL KEYS file](http://www.apache.org/dist/incubator/vcl/KEYS)
-
-
-
-
+[Download ASF VCL 2.2](http://vcl.apache.org/downloads/download.cgi?Preferred=http://archive.apache.org/dist/&action=download&filename=%2Fincubator%2Fvcl%2Fapache-VCL-2.2-incubating.tar.bz2)<br>
+[GPG Signature](http://archive.apache.org/dist/incubator/vcl/apache-VCL-2.2-incubating.tar.bz2.asc)<br>
+[MD5 Sum](http://archive.apache.org/dist/incubator/vcl/apache-VCL-2.2-incubating.tar.bz2.md5)<br>
+[SHA1 Sum](http://archive.apache.org/dist/incubator/vcl/apache-VCL-2.2-incubating.tar.bz2.sha1)<br>
+[VCL KEYS file](http://www.apache.org/dist/vcl/KEYS)
 
 Run the following command to verify the MD5 sum. You should get the same
 number that is in apache-VCL-2.2-incubating.tar.bz2.md5:
-md5sum apache-VCL-2.2-incubating.tar.bz2
+
+    md5sum apache-VCL-2.2-incubating.tar.bz2
 
 Similarly, Run the following command to verify the SHA1 sum. You should get
 the same number that is in apache-VCL-2.2-incubating.tar.bz2.sha1:
-sha1sum apache-VCL-2.2-incubating.tar.bz2
+
+    sha1sum apache-VCL-2.2-incubating.tar.bz2
 
 To verify the GPG signature (you'll need to have [GnuPG](http://www.gnupg.org/)
  installed):
+
 1. download and import the VCL KEYS file:
-gpg \--import KEYS
+
+    gpg --import KEYS
 1. download the GPG Signature to the same location as the release file
 1. from the directory containing both the release file and the GPG
 signature, run
-gpg \--verify apache-VCL-2.2-incubating.tar.bz2.asc
 
-For new installs, visit the on-line [installation guide](vcl-2.2-installation.html)
-.
+    gpg --verify apache-VCL-2.2-incubating.tar.bz2.asc
 
-For upgrades from version 2.1, visit the on-line [upgrade guide](vcl:upgrade-from-previous-version.html)
-.
+For new installs, visit the on-line [installation guide](vcl-2.2-installation.html).
+
+For upgrades from version 2.1, visit the on-line [upgrade guide](upgrade-from-previous-version.html).
 
 
 
@@ -90,22 +78,26 @@ purchased licenses and free licenses.
 #### II. VCL Roadmap
 
 VCL 2.2 (this release)
+
 * support for xCAT 2.x
 * VMWare Free Server 2.x and ESXi 4
 * improve block reservations (renamed to block allocations)
 
 VCL 2.3
+
 * Service deployments
 * power management
 * improve cluster reservations
 
 VCL 2.4
+
 * additional and improved hypervisor support
 * KVM and possibly others (virtual box and XEN)
 * Allow for additional access methods for environments (port, other
 protocols, etc)
 
 VCL 2.5
+
 * develop tools for managing both system and user storage
 
 With each release, we'll be working toward making VCL easier to install. As
@@ -120,27 +112,24 @@ install.
 There are five ways to become involved in the ASF VCL community.
 
 * Join the mailing lists and participate in discussion. There are two
-mailing lists: vcl-user@incubator.apache.org
-vcl-dev@incubator.apache.org
-To join vcl-user, send an empty message to
-[vcl-user-subscribe@incubator.apache.org](mailto:vcl-user-subscribe@incubator.apache.org|click-to-subscribe.html)
-. To join vcl-dev, send an empty
-message to [vcl-dev-subscribe@incubator.apache.org](mailto:vcl-dev-subscribe@incubator.apache.org|click-to-subscribe.html)
-.
+mailing lists:<br>
+user@vcl.apache.org<br>
+dev@vcl.apache.org<br>
+To join user, send an empty message to
+[user-subscribe@vcl.apache.org](mailto:user-subscribe@vcl.apache.org). 
+To join dev, send an empty message to 
+[dev-subscribe@vcl.apache.org](mailto:dev-subscribe@vcl.apache.org).
 
 * Submit bug reports and feature requests to our JIRA bug tracking system.
 See section IV below for more information on doing this.
 
-* Create documentation on our Confluence site. Create an account at [http://cwiki.apache.org/confluence/display/VCL/Index](http://cwiki.apache.org/confluence/display/VCL/Index)
- and just start adding content. (Note to current community: We should
-create a page explaining the layout so new people will know where to add
-content better.)
+* [Create documentation](/comm/contribute-documentation.html) on our CMS site. 
 
-* Submit patches through the vcl-dev mailing list and via the JIRA bug
+* Submit patches through the dev mailing list and via the JIRA bug
 tracking system. Once you have become familiar with VCL, you can begin
 assisting with the development of it by picking a JIRA issue to fix or by
 adding a feature needed at your site. Then, contribute a patch of your
-changes through the JIRA tracking system and send a message to the vcl-dev
+changes through the JIRA tracking system and send a message to the dev
 list explaining what you have done.
 
 * Become an official committer to the project. Once you have shown that you
@@ -150,7 +139,7 @@ join the development work by submitting 
 code to the project.
 
 * If you are interested in contributing something to the project, please
-discuss it on the vcl-dev list BEFORE starting work on it. This allows the
+discuss it on the dev list BEFORE starting work on it. This allows the
 community to be involved in decisions and allows current developers to
 provide some guidance.
 
@@ -162,12 +151,12 @@ If you find a bug, please submit a bug r
 system at [http://issues.apache.org/jira/browse/VCL](http://issues.apache.org/jira/browse/VCL)
  (you will need to set up an account there if you haven't already done so -
 it's free to anyone). Also, we would appreciate it if you mentioned that
-you filed a bug on the vcl-dev list to make sure we don't miss it.
+you filed a bug on the dev list to make sure we don't miss it.
 
 If you would like to requrest a new feature, you can also submit that in
 the same way through JIRA (just select "New Feature" or "Improvement" as
 the Issue Type). Again, it would be helpful if you mentioned that you filed
-a feature request on the vcl-dev list.
+a feature request on the dev list.
 
 After you have created a JIRA issue, you have the option to vote on it to
 help us know how to prioritize issues. You can also "watch" the issue to



Mime
View raw message