svn commit: r940070 [8/9] - in /websites/staging/vcl/trunk/content: ./ comm/commprojects/ confluence_export/ dev/ docs/ docs/UpgradePreviousVersions/ docs/archives/old-releases/

[buildbot]

Modified: 
websites/staging/vcl/trunk/content/docs/adding-xcat-kickstart-based-image.html
==============================================================================
--- 
websites/staging/vcl/trunk/content/docs/adding-xcat-kickstart-based-image.html 
(original)
+++ 
websites/staging/vcl/trunk/content/docs/adding-xcat-kickstart-based-image.html 
Fri Feb 13 19:07:47 2015
@@ -111,11 +111,11 @@ below.</p>
 as above <strong>rhel5-base25-v0.</strong> In the below sql statement make any
 changes as needed such as ownerid, in this example it is set to 1 or the
 admin user id.</p>
-<div class="codehilite"><pre><span class="n">INSERT</span> <span 
class="n">INTO</span> <span class="sb">`image`</span> <span 
class="p">(</span><span class="n">id</span><span class="p">,</span> <span 
class="sb">`name`</span><span class="p">,</span> <span 
class="sb">`prettyname`</span><span class="p">,</span> <span 
class="sb">`ownerid`</span><span class="p">,</span> <span 
class="sb">`platformid`</span><span class="p">,</span> <span 
class="sb">`OSid`</span><span class="p">,</span> <span 
class="sb">`minram`</span><span class="p">,</span> <span 
class="sb">`minprocnumber`</span><span class="p">,</span> <span 
class="sb">`minprocspeed`</span><span class="p">,</span> <span 
class="sb">`minnetwork`</span><span class="p">,</span><span 
class="sb">`reloadtime`</span><span class="p">,</span> <span 
class="sb">`deleted`</span><span class="p">,</span> <span 
class="sb">`lastupdate`</span><span class="p">,</span> <span 
class="sb">`forcheckout`</span><span class="p">,</span> <span 
class="sb">`maxinitial
 time`</span><span class="p">,</span><span class="sb">`project`</span><span 
class="p">,</span> <span class="sb">`size`</span><span class="p">)</span> <span 
class="n">VALUES</span> <span class="p">(</span><span class="mi">25</span><span 
class="p">,</span> <span class="s">&#39;rhel5-base25-v0&#39;</span><span 
class="p">,</span> <span class="s">&#39;RHEL 5 base&#39;</span><span 
class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span 
class="mi">1</span><span class="p">,</span> <span class="mi">19</span><span 
class="p">,</span> <span class="mi">1024</span><span class="p">,</span> <span 
class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span 
class="p">,</span> <span class="mi">10</span><span class="p">,</span> <span 
class="mi">14</span><span class="p">,</span> <span class="mi">0</span><span 
class="p">,</span> <span class="n">NOW</span><span class="p">(),</span> <span 
class="mi">1</span><span class="p">,</span> <span class="mi">0</span><span 
class="p">,
 </span> <span class="s">&#39;vcl&#39;</span><span class="p">,</span> <span 
class="mi">1045</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">INSERT</span> <span 
class="n">INTO</span> `<span class="n">image</span>` <span 
class="p">(</span><span class="n">id</span><span class="p">,</span> `<span 
class="n">name</span>`<span class="p">,</span> `<span 
class="n">prettyname</span>`<span class="p">,</span> `<span 
class="n">ownerid</span>`<span class="p">,</span> `<span 
class="n">platformid</span>`<span class="p">,</span> `<span 
class="n">OSid</span>`<span class="p">,</span> `<span 
class="n">minram</span>`<span class="p">,</span> `<span 
class="n">minprocnumber</span>`<span class="p">,</span> `<span 
class="n">minprocspeed</span>`<span class="p">,</span> `<span 
class="n">minnetwork</span>`<span class="p">,</span>`<span 
class="n">reloadtime</span>`<span class="p">,</span> `<span 
class="n">deleted</span>`<span class="p">,</span> `<span 
class="n">lastupdate</span>`<span class="p">,</span> `<span 
class="n">forcheckout</span>`<span class="p">,</span> `<span 
class="n">maxinitialtime</span>`<sp
 an class="p">,</span>`<span class="n">project</span>`<span class="p">,</span> 
`<span class="nb">size</span>`<span class="p">)</span> <span 
class="n">VALUES</span> <span class="p">(</span>25<span class="p">,</span> 
<span class="s">&#39;rhel5-base25-v0&#39;</span><span class="p">,</span> <span 
class="s">&#39;RHEL 5 base&#39;</span><span class="p">,</span> 1<span 
class="p">,</span> 1<span class="p">,</span> 19<span class="p">,</span> 
1024<span class="p">,</span> 1<span class="p">,</span> 0<span 
class="p">,</span> 10<span class="p">,</span> 14<span class="p">,</span> 0<span 
class="p">,</span> <span class="n">NOW</span><span class="p">(),</span> 1<span 
class="p">,</span> 0<span class="p">,</span> <span 
class="s">&#39;vcl&#39;</span><span class="p">,</span> 1045<span 
class="p">);</span>
 
-<span class="n">INSERT</span> <span class="n">INTO</span> <span 
class="sb">`imagerevision`</span> <span class="p">(</span><span 
class="sb">`imageid`</span><span class="p">,</span> <span 
class="sb">`revision`</span><span class="p">,</span> <span 
class="sb">`userid`</span><span class="p">,</span> <span 
class="sb">`datecreated`</span><span class="p">,</span> <span 
class="sb">`deleted`</span><span class="p">,</span> <span 
class="sb">`production`</span><span class="p">,</span> <span 
class="sb">`comments`</span><span class="p">,</span> <span 
class="sb">`imagename`</span><span class="p">)</span> <span 
class="n">VALUES</span> <span class="p">(</span><span class="mi">25</span><span 
class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span 
class="mi">1</span><span class="p">,</span> <span class="n">NOW</span><span 
class="p">(),</span> <span class="mi">0</span><span class="p">,</span> <span 
class="mi">1</span><span class="p">,</span> <span class="n">NULL</span><span 
class="p">
 ,</span> <span class="s">&#39;rhel5-base25-v0&#39;</span><span 
class="p">);</span>
+<span class="n">INSERT</span> <span class="n">INTO</span> `<span 
class="n">imagerevision</span>` <span class="p">(</span>`<span 
class="n">imageid</span>`<span class="p">,</span> `<span 
class="n">revision</span>`<span class="p">,</span> `<span 
class="n">userid</span>`<span class="p">,</span> `<span 
class="n">datecreated</span>`<span class="p">,</span> `<span 
class="n">deleted</span>`<span class="p">,</span> `<span 
class="n">production</span>`<span class="p">,</span> `<span 
class="n">comments</span>`<span class="p">,</span> `<span 
class="n">imagename</span>`<span class="p">)</span> <span 
class="n">VALUES</span> <span class="p">(</span>25<span class="p">,</span> 
0<span class="p">,</span> 1<span class="p">,</span> <span 
class="n">NOW</span><span class="p">(),</span> 0<span class="p">,</span> 1<span 
class="p">,</span> <span class="n">NULL</span><span class="p">,</span> <span 
class="s">&#39;rhel5-base25-v0&#39;</span><span class="p">);</span>
 
-<span class="n">INSERT</span> <span class="n">INTO</span> <span 
class="sb">`resource`</span> <span class="p">(</span><span 
class="sb">`resourcetypeid`</span><span class="p">,</span> <span 
class="sb">`subid`</span><span class="p">)</span> <span class="n">VALUES</span> 
<span class="p">(</span><span class="mi">13</span><span class="p">,</span> 
<span class="mi">25</span><span class="p">);</span>
+<span class="n">INSERT</span> <span class="n">INTO</span> `<span 
class="n">resource</span>` <span class="p">(</span>`<span 
class="n">resourcetypeid</span>`<span class="p">,</span> `<span 
class="n">subid</span>`<span class="p">)</span> <span class="n">VALUES</span> 
<span class="p">(</span>13<span class="p">,</span> 25<span class="p">);</span>
 </pre></div>
 
 
@@ -141,7 +141,7 @@ debug any issues that may occur.</p>
 <h2 id="extending-the-os-table">Extending the OS table</h2>
 <p>If VCL supports the OS, extending the OS table for a new OS is fairly
 straight forward. In this example we will use Red Hat 6.</p>
-<div class="codehilite"><pre><span class="n">INSERT</span> <span 
class="n">INTO</span> <span class="sb">`OS`</span> <span 
class="p">(</span><span class="sb">`name`</span><span class="p">,</span> <span 
class="sb">`prettyname`</span><span class="p">,</span> <span 
class="sb">`type`</span><span class="p">,</span> <span 
class="sb">`installtype`</span><span class="p">,</span> <span 
class="sb">`sourcepath`</span><span class="p">,</span> <span 
class="sb">`moduleid`</span><span class="p">)</span> <span 
class="n">VALUES</span> <span class="p">(</span><span 
class="s">&#39;rhel6&#39;</span><span class="p">,</span><span 
class="s">&#39;RedHat Enterprise 6&#39;</span><span class="p">,</span><span 
class="s">&#39;linux&#39;</span><span class="p">,</span><span 
class="s">&#39;kickstart&#39;</span><span class="p">,</span><span 
class="s">&#39;rhel6&#39;</span><span class="p">,</span> <span 
class="p">(</span><span class="n">SELECT</span> <span class="sb">`id`</span> 
<span class="n">FROM</span> <span clas
 s="sb">`module`</span> <span class="n">WHERE</span> <span 
class="sb">`name`</span> <span class="n">LIKE</span> <span 
class="s">&#39;os_linux&#39;</span><span class="p">));</span>
+<div class="codehilite"><pre><span class="n">INSERT</span> <span 
class="n">INTO</span> `<span class="n">OS</span>` <span 
class="p">(</span>`<span class="n">name</span>`<span class="p">,</span> `<span 
class="n">prettyname</span>`<span class="p">,</span> `<span 
class="n">type</span>`<span class="p">,</span> `<span 
class="n">installtype</span>`<span class="p">,</span> `<span 
class="n">sourcepath</span>`<span class="p">,</span> `<span 
class="n">moduleid</span>`<span class="p">)</span> <span 
class="n">VALUES</span> <span class="p">(</span><span 
class="s">&#39;rhel6&#39;</span><span class="p">,</span><span 
class="s">&#39;RedHat Enterprise 6&#39;</span><span class="p">,</span><span 
class="s">&#39;linux&#39;</span><span class="p">,</span><span 
class="s">&#39;kickstart&#39;</span><span class="p">,</span><span 
class="s">&#39;rhel6&#39;</span><span class="p">,</span> <span 
class="p">(</span><span class="n">SELECT</span> `<span class="n">id</span>` 
<span class="n">FROM</span> `<span class="n">m
 odule</span>` <span class="n">WHERE</span> `<span class="n">name</span>` <span 
class="n">LIKE</span> <span class="s">&#39;os_linux&#39;</span><span 
class="p">));</span>
 </pre></div>
   </div>
   

Modified: websites/staging/vcl/trunk/content/docs/addingvmcomputers.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/addingvmcomputers.html (original)
+++ websites/staging/vcl/trunk/content/docs/addingvmcomputers.html Fri Feb 13 
19:07:47 2015
@@ -88,11 +88,11 @@
 <li>Public MAC Address</li>
 <li>
 <p>Private MAC Address</p>
-<div class="codehilite"><pre><span class="err">NOTE:</span> <span 
class="err">For</span> <span class="err">VMware</span> <span 
class="err">virtual</span> <span class="err">machines,</span> <span 
class="err">the</span> <span class="err">MAC</span> <span 
class="err">addresses</span> <span class="err">you</span> <span 
class="err">choose</span>
-<span class="err">must</span> <span class="err">be</span> <span 
class="err">in</span> <span class="err">the</span> <span 
class="err">range</span> <span class="err">00:50:56:00:00:00</span> <span 
class="err">-</span> <span class="err">00:50:56:3F:FF:FF.</span> <span 
class="err">Pay</span>
-<span class="err">special</span> <span class="err">attention</span> <span 
class="err">to</span> <span class="err">the</span> <span 
class="err">upper</span> <span class="err">bound</span> <span 
class="err">of</span> <span class="err">this</span> <span 
class="err">range.</span> 
-<span class="err">00:50:56:40:00:00</span> <span class="err">-</span> <span 
class="err">00:50:56:FF:FF:FF</span> <span class="err">are</span> <span 
class="err">NOT</span> <span class="err">valid</span> <span 
class="err">VMware</span>
-<span class="err">virtual</span> <span class="err">machines.</span>
+<div class="codehilite"><pre><span class="n">NOTE</span><span 
class="o">:</span> <span class="n">For</span> <span class="n">VMware</span> 
<span class="n">virtual</span> <span class="n">machines</span><span 
class="o">,</span> <span class="n">the</span> <span class="n">MAC</span> <span 
class="n">addresses</span> <span class="n">you</span> <span 
class="n">choose</span>
+<span class="n">must</span> <span class="n">be</span> <span 
class="k">in</span> <span class="n">the</span> <span class="n">range</span> 
<span class="mi">00</span><span class="o">:</span><span 
class="mi">50</span><span class="o">:</span><span class="mi">56</span><span 
class="o">:</span><span class="mi">00</span><span class="o">:</span><span 
class="mi">00</span><span class="o">:</span><span class="mi">00</span> <span 
class="o">-</span> <span class="mi">00</span><span class="o">:</span><span 
class="mi">50</span><span class="o">:</span><span class="mi">56</span><span 
class="o">:</span><span class="mi">3</span><span class="n">F</span><span 
class="o">:</span><span class="n">FF</span><span class="o">:</span><span 
class="n">FF</span><span class="o">.</span> <span class="n">Pay</span>
+<span class="n">special</span> <span class="n">attention</span> <span 
class="n">to</span> <span class="n">the</span> <span class="n">upper</span> 
<span class="n">bound</span> <span class="n">of</span> <span 
class="k">this</span> <span class="n">range</span><span class="o">.</span> 
+<span class="mi">00</span><span class="o">:</span><span 
class="mi">50</span><span class="o">:</span><span class="mi">56</span><span 
class="o">:</span><span class="mi">40</span><span class="o">:</span><span 
class="mi">00</span><span class="o">:</span><span class="mi">00</span> <span 
class="o">-</span> <span class="mi">00</span><span class="o">:</span><span 
class="mi">50</span><span class="o">:</span><span class="mi">56</span><span 
class="o">:</span><span class="n">FF</span><span class="o">:</span><span 
class="n">FF</span><span class="o">:</span><span class="n">FF</span> <span 
class="n">are</span> <span class="n">NOT</span> <span class="n">valid</span> 
<span class="n">VMware</span>
+<span class="n">virtual</span> <span class="n">machines</span><span 
class="o">.</span>
 </pre></div>
 
 
@@ -144,11 +144,11 @@
      second computer, etc, you can enter the first one here and then
      have the option of downloading data to add to your dhcpd.conf
      file from the Computer Utilities page</p>
-<div class="codehilite"><pre>     <span class="n">NOTE:</span> <span 
class="n">For</span> <span class="n">VMware</span> <span 
class="n">virtual</span> <span class="n">machines</span><span 
class="p">,</span> <span class="n">the</span> <span class="n">MAC</span> <span 
class="n">addresses</span> <span class="n">you</span> <span 
class="n">choose</span>
-     <span class="n">must</span> <span class="n">be</span> <span 
class="n">in</span> <span class="n">the</span> <span class="n">range</span> 
<span class="mo">00</span><span class="p">:</span><span 
class="mi">50</span><span class="p">:</span><span class="mi">56</span><span 
class="p">:</span><span class="mo">00</span><span class="p">:</span><span 
class="mo">00</span><span class="p">:</span><span class="mo">00</span> <span 
class="o">-</span> <span class="mo">00</span><span class="p">:</span><span 
class="mi">50</span><span class="p">:</span><span class="mi">56</span><span 
class="p">:</span><span class="mi">3</span><span class="n">F:FF:FF</span><span 
class="o">.</span> <span class="n">Pay</span>
-     <span class="n">special</span> <span class="n">attention</span> <span 
class="n">to</span> <span class="n">the</span> <span class="n">upper</span> 
<span class="n">bound</span> <span class="n">of</span> <span 
class="n">this</span> <span class="n">range</span><span class="o">.</span> 
-     <span class="mo">00</span><span class="p">:</span><span 
class="mi">50</span><span class="p">:</span><span class="mi">56</span><span 
class="p">:</span><span class="mi">40</span><span class="p">:</span><span 
class="mo">00</span><span class="p">:</span><span class="mo">00</span> <span 
class="o">-</span> <span class="mo">00</span><span class="p">:</span><span 
class="mi">50</span><span class="p">:</span><span class="mi">56</span><span 
class="p">:</span><span class="n">FF:FF:FF</span> <span class="n">are</span> 
<span class="n">NOT</span> <span class="n">valid</span> <span 
class="n">VMware</span>
-     <span class="n">virtual</span> <span class="n">machines</span><span 
class="o">.</span>
+<div class="codehilite"><pre>     <span class="n">NOTE</span><span 
class="p">:</span> <span class="n">For</span> <span class="n">VMware</span> 
<span class="n">virtual</span> <span class="n">machines</span><span 
class="p">,</span> <span class="n">the</span> <span class="n">MAC</span> <span 
class="n">addresses</span> <span class="n">you</span> <span 
class="n">choose</span>
+     <span class="n">must</span> <span class="n">be</span> <span 
class="n">in</span> <span class="n">the</span> <span class="n">range</span> 
00<span class="p">:</span>50<span class="p">:</span>56<span 
class="p">:</span>00<span class="p">:</span>00<span class="p">:</span>00 <span 
class="o">-</span> 00<span class="p">:</span>50<span class="p">:</span>56<span 
class="p">:</span>3<span class="n">F</span><span class="p">:</span><span 
class="n">FF</span><span class="p">:</span><span class="n">FF</span><span 
class="p">.</span> <span class="n">Pay</span>
+     <span class="n">special</span> <span class="n">attention</span> <span 
class="n">to</span> <span class="n">the</span> <span class="n">upper</span> 
<span class="n">bound</span> <span class="n">of</span> <span 
class="n">this</span> <span class="n">range</span><span class="p">.</span> 
+     00<span class="p">:</span>50<span class="p">:</span>56<span 
class="p">:</span>40<span class="p">:</span>00<span class="p">:</span>00 <span 
class="o">-</span> 00<span class="p">:</span>50<span class="p">:</span>56<span 
class="p">:</span><span class="n">FF</span><span class="p">:</span><span 
class="n">FF</span><span class="p">:</span><span class="n">FF</span> <span 
class="n">are</span> <span class="n">NOT</span> <span class="n">valid</span> 
<span class="n">VMware</span>
+     <span class="n">virtual</span> <span class="n">machines</span><span 
class="p">.</span>
 </pre></div>
 
 

Modified: 
websites/staging/vcl/trunk/content/docs/archives/old-releases/2.2-database-configuration.html
==============================================================================
--- 
websites/staging/vcl/trunk/content/docs/archives/old-releases/2.2-database-configuration.html
 (original)
+++ 
websites/staging/vcl/trunk/content/docs/archives/old-releases/2.2-database-configuration.html
 Fri Feb 13 19:07:47 2015
@@ -81,8 +81,8 @@ import the VCL database schema.</p>
 <p>You should have mysql server 5.x installed.&nbsp;If mysql server is not
 installed:</p>
 <div class="codehilite"><pre><span class="n">yum</span> <span 
class="n">install</span> <span class="n">mysql</span><span 
class="o">-</span><span class="n">server</span> <span class="o">-</span><span 
class="n">y</span>
-<span class="sr">/sbin/c</span><span class="n">hkconfig</span> <span 
class="o">--</span><span class="n">level</span> <span class="mi">345</span> 
<span class="n">mysqld</span> <span class="n">on</span>
-<span class="sr">/sbin/s</span><span class="n">ervice</span> <span 
class="n">mysqld</span> <span class="n">start</span>
+<span class="o">/</span><span class="n">sbin</span><span 
class="o">/</span><span class="n">chkconfig</span> <span 
class="o">--</span><span class="n">level</span> 345 <span 
class="n">mysqld</span> <span class="n">on</span>
+<span class="o">/</span><span class="n">sbin</span><span 
class="o">/</span><span class="n">service</span> <span class="n">mysqld</span> 
<span class="n">start</span>
 </pre></div>
 
 

Modified: 
websites/staging/vcl/trunk/content/docs/archives/old-releases/2.2-management-node-installation.html
==============================================================================
--- 
websites/staging/vcl/trunk/content/docs/archives/old-releases/2.2-management-node-installation.html
 (original)
+++ 
websites/staging/vcl/trunk/content/docs/archives/old-releases/2.2-management-node-installation.html
 Fri Feb 13 19:07:47 2015
@@ -148,7 +148,7 @@ modules in order to run. These Perl modu
 <p>A script is provided in the managementnode/bin directory called
 <em>install_perl_libs.pl</em> which will attempt to download and install the
 required perl libraries.&nbsp; Run the script:</p>
-<div class="codehilite"><pre><span class="n">perl</span> <span 
class="sr">/usr/</span><span class="nb">local</span><span 
class="sr">/vcl/</span><span class="n">bin</span><span class="o">/</span><span 
class="n">install_perl_libs</span><span class="o">.</span><span 
class="n">pl</span>
+<div class="codehilite"><pre><span class="n">perl</span> <span 
class="o">/</span><span class="n">usr</span><span class="o">/</span><span 
class="n">local</span><span class="o">/</span><span class="n">vcl</span><span 
class="o">/</span><span class="n">bin</span><span class="o">/</span><span 
class="n">install_perl_libs</span><span class="p">.</span><span 
class="n">pl</span>
 </pre></div>
 
 
@@ -156,24 +156,24 @@ required perl libraries.&nbsp; Run the s
 <p><a 
name="2.2ManagementNodeInstallation-HowtoTestifRequiredPerlModulesareInstalled"></a></p>
 <h4 id="how-to-test-if-required-perl-modules-are-installed">How to Test if 
Required Perl Modules are Installed</h4>
 <p>Run the following command to execute the utils.pm file:</p>
-<div class="codehilite"><pre><span class="n">perl</span> <span 
class="sr">/usr/</span><span class="nb">local</span><span 
class="sr">/vcl/</span><span class="n">lib</span><span 
class="sr">/VCL/</span><span class="n">utils</span><span 
class="o">.</span><span class="n">pm</span>
+<div class="codehilite"><pre><span class="n">perl</span> <span 
class="o">/</span><span class="n">usr</span><span class="o">/</span><span 
class="n">local</span><span class="o">/</span><span class="n">vcl</span><span 
class="o">/</span><span class="n">lib</span><span class="o">/</span><span 
class="n">VCL</span><span class="o">/</span><span class="n">utils</span><span 
class="p">.</span><span class="n">pm</span>
 </pre></div>
 
 
 <p>Executing utils.pm does not actually do anything but this will tell you if
 VCL will be able to run.&nbsp; If any Perl modules are missing you will see
 "Can't locate" lines:</p>
-<div class="codehilite"><pre><span class="n">Can</span><span 
class="err">&#39;</span><span class="n">t</span> <span class="n">locate</span> 
<span class="n">HTTP</span><span class="o">/</span><span 
class="n">Headers</span><span class="o">.</span><span class="n">pm</span> <span 
class="n">in</span> <span class="nv">@INC</span> <span class="p">(</span><span 
class="nv">@INC</span> <span class="n">contains:</span><span 
class="o">...</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="n">Can</span><span 
class="o">&#39;</span><span class="n">t</span> <span class="n">locate</span> 
<span class="n">HTTP</span><span class="o">/</span><span 
class="n">Headers</span><span class="p">.</span><span class="n">pm</span> <span 
class="n">in</span> <span class="p">@</span><span class="n">INC</span> <span 
class="p">(@</span><span class="n">INC</span> <span 
class="n">contains</span><span class="p">:...)</span>
 </pre></div>
 
 
 <p>Once all of the required modules are installed, you should see output 
similar to the following:</p>
-<div class="codehilite"><pre><span class="n">BIN</span> <span 
class="n">PATH:</span> <span class="sr">/usr/</span><span 
class="nb">local</span><span class="sr">/vcl/</span><span 
class="n">lib</span><span class="o">/</span><span class="n">VCL</span>
-<span class="n">pre</span><span class="o">-</span><span 
class="n">execution:</span> <span class="n">config</span> <span 
class="n">file</span> <span class="n">being</span> <span class="n">used:</span> 
<span class="sr">/etc/</span><span class="n">vcl</span><span 
class="o">/</span><span class="n">vcld</span><span class="o">.</span><span 
class="n">conf</span>
-<span class="n">Uncaught</span> <span class="n">exception</span> <span 
class="n">from</span> <span class="n">user</span> <span class="n">code:</span>
-        <span class="n">VCLD</span> <span class="p">:</span> <span 
class="sr">/etc/</span><span class="n">vcl</span><span class="o">/</span><span 
class="n">vcld</span><span class="o">.</span><span class="n">conf</span> <span 
class="n">does</span> <span class="ow">not</span> <span 
class="n">exist</span><span class="p">,</span> <span class="n">exiting</span> 
<span class="o">--</span> <span class="n">No</span> <span class="n">such</span> 
<span class="n">file</span> <span class="ow">or</span> <span 
class="n">directory</span>
-<span class="k">BEGIN</span> <span class="n">failed</span><span 
class="o">--</span><span class="n">compilation</span> <span 
class="n">aborted</span> <span class="n">at</span> <span 
class="sr">/usr/</span><span class="nb">local</span><span 
class="sr">/vcl/</span><span class="n">lib</span><span 
class="sr">/VCL/</span><span class="n">utils</span><span 
class="o">.</span><span class="n">pm</span> <span class="n">line</span> <span 
class="mi">616</span><span class="o">.</span>
-<span class="n">at</span> <span class="sr">/usr/</span><span 
class="nb">local</span><span class="sr">/vcl/</span><span 
class="n">lib</span><span class="sr">/VCL/</span><span 
class="n">utils</span><span class="o">.</span><span class="n">pm</span> <span 
class="n">line</span> <span class="mi">616</span>
+<div class="codehilite"><pre><span class="n">BIN</span> <span 
class="n">PATH</span><span class="p">:</span> <span class="o">/</span><span 
class="n">usr</span><span class="o">/</span><span class="n">local</span><span 
class="o">/</span><span class="n">vcl</span><span class="o">/</span><span 
class="n">lib</span><span class="o">/</span><span class="n">VCL</span>
+<span class="n">pre</span><span class="o">-</span><span 
class="n">execution</span><span class="p">:</span> <span 
class="n">config</span> <span class="n">file</span> <span 
class="n">being</span> <span class="n">used</span><span class="p">:</span> 
<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span 
class="n">vcl</span><span class="o">/</span><span class="n">vcld</span><span 
class="p">.</span><span class="n">conf</span>
+<span class="n">Uncaught</span> <span class="n">exception</span> <span 
class="n">from</span> <span class="n">user</span> <span 
class="n">code</span><span class="p">:</span>
+        <span class="n">VCLD</span> <span class="p">:</span> <span 
class="o">/</span><span class="n">etc</span><span class="o">/</span><span 
class="n">vcl</span><span class="o">/</span><span class="n">vcld</span><span 
class="p">.</span><span class="n">conf</span> <span class="n">does</span> <span 
class="n">not</span> <span class="n">exist</span><span class="p">,</span> <span 
class="n">exiting</span> <span class="o">--</span> <span class="n">No</span> 
<span class="n">such</span> <span class="n">file</span> <span 
class="n">or</span> <span class="n">directory</span>
+<span class="n">BEGIN</span> <span class="n">failed</span><span 
class="o">--</span><span class="n">compilation</span> <span 
class="n">aborted</span> <span class="n">at</span> <span 
class="o">/</span><span class="n">usr</span><span class="o">/</span><span 
class="n">local</span><span class="o">/</span><span class="n">vcl</span><span 
class="o">/</span><span class="n">lib</span><span class="o">/</span><span 
class="n">VCL</span><span class="o">/</span><span class="n">utils</span><span 
class="p">.</span><span class="n">pm</span> <span class="n">line</span> 
616<span class="p">.</span>
+<span class="n">at</span> <span class="o">/</span><span 
class="n">usr</span><span class="o">/</span><span class="n">local</span><span 
class="o">/</span><span class="n">vcl</span><span class="o">/</span><span 
class="n">lib</span><span class="o">/</span><span class="n">VCL</span><span 
class="o">/</span><span class="n">utils</span><span class="p">.</span><span 
class="n">pm</span> <span class="n">line</span> 616
 </pre></div>
 
 
@@ -222,7 +222,7 @@ change to this directory:</p>
 </li>
 </ol>
 <p>The last line you should see should be:</p>
-<div class="codehilite"><pre><span class="sr">/usr/</span><span 
class="n">bin</span><span class="o">/</span><span class="n">make</span> <span 
class="n">install</span>  <span class="o">--</span> <span class="n">OK</span>
+<div class="codehilite"><pre><span class="o">/</span><span 
class="n">usr</span><span class="o">/</span><span class="n">bin</span><span 
class="o">/</span><span class="n">make</span> <span class="n">install</span>  
<span class="o">--</span> <span class="n">OK</span>
 </pre></div>
 
 
@@ -304,15 +304,15 @@ match the name that was configured for t
 <p>Start the vcld service:</p>
 <p><strong>/sbin/service vcld start</strong></p>
 <p>You should see output similar to the following:</p>
-<div class="codehilite"><pre><span class="n">Starting</span> <span 
class="n">vcld</span> <span class="n">daemon:</span> <span class="n">BIN</span> 
<span class="n">PATH:</span> <span class="sr">/usr/</span><span 
class="nb">local</span><span class="sr">/vcl/</span><span class="n">bin</span>
-<span class="n">pre</span><span class="o">-</span><span 
class="n">execution:</span> <span class="n">config</span> <span 
class="n">file</span> <span class="n">being</span> <span class="n">used:</span> 
<span class="sr">/etc/</span><span class="n">vcl</span><span 
class="o">/</span><span class="n">vcld</span><span class="o">.</span><span 
class="n">conf</span>
-<span class="n">FQDN</span> <span class="n">is</span> <span 
class="ow">not</span> <span class="n">listed</span>
-<span class="n">pre</span><span class="o">-</span><span 
class="n">execution:</span> <span class="n">process</span> <span 
class="n">name</span> <span class="n">is</span> <span class="n">set</span> 
<span class="n">to:</span> <span class="n">vcld</span>
-<span class="n">pre</span><span class="o">-</span><span 
class="n">execution:</span> <span class="n">verbose</span> <span 
class="n">mode</span> <span class="n">is</span> <span class="n">set</span> 
<span class="n">to:</span> <span class="mi">1</span>
-<span class="n">pre</span><span class="o">-</span><span 
class="n">execution:</span> <span class="n">testing</span> <span 
class="n">mode</span> <span class="n">is</span> <span class="n">set</span> 
<span class="n">to:</span> <span class="mi">0</span>
-<span class="n">pre</span><span class="o">-</span><span 
class="n">execution:</span> <span class="nb">log</span> <span 
class="n">file</span> <span class="n">being</span> <span class="n">used:</span> 
<span class="sr">/var/</span><span class="nb">log</span><span 
class="o">/</span><span class="n">vcld</span><span class="o">.</span><span 
class="nb">log</span>
-<span class="n">pre</span><span class="o">-</span><span 
class="n">execution:</span> <span class="n">PID</span> <span 
class="n">file</span> <span class="n">being</span> <span class="n">used:</span> 
<span class="sr">/var/</span><span class="n">run</span><span 
class="o">/</span><span class="n">vcld</span><span class="o">.</span><span 
class="n">pid</span>
-<span class="n">Created</span> <span class="n">process</span> <span 
class="mi">23696</span> <span class="n">renamed</span> <span 
class="n">to</span> <span class="n">vcld</span> <span class="o">...</span>
+<div class="codehilite"><pre><span class="n">Starting</span> <span 
class="n">vcld</span> <span class="n">daemon</span><span class="p">:</span> 
<span class="n">BIN</span> <span class="n">PATH</span><span class="p">:</span> 
<span class="o">/</span><span class="n">usr</span><span class="o">/</span><span 
class="n">local</span><span class="o">/</span><span class="n">vcl</span><span 
class="o">/</span><span class="n">bin</span>
+<span class="n">pre</span><span class="o">-</span><span 
class="n">execution</span><span class="p">:</span> <span 
class="n">config</span> <span class="n">file</span> <span 
class="n">being</span> <span class="n">used</span><span class="p">:</span> 
<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span 
class="n">vcl</span><span class="o">/</span><span class="n">vcld</span><span 
class="p">.</span><span class="n">conf</span>
+<span class="n">FQDN</span> <span class="n">is</span> <span 
class="n">not</span> <span class="n">listed</span>
+<span class="n">pre</span><span class="o">-</span><span 
class="n">execution</span><span class="p">:</span> <span 
class="n">process</span> <span class="n">name</span> <span class="n">is</span> 
<span class="n">set</span> <span class="n">to</span><span class="p">:</span> 
<span class="n">vcld</span>
+<span class="n">pre</span><span class="o">-</span><span 
class="n">execution</span><span class="p">:</span> <span 
class="n">verbose</span> <span class="n">mode</span> <span class="n">is</span> 
<span class="n">set</span> <span class="n">to</span><span class="p">:</span> 1
+<span class="n">pre</span><span class="o">-</span><span 
class="n">execution</span><span class="p">:</span> <span 
class="n">testing</span> <span class="n">mode</span> <span class="n">is</span> 
<span class="n">set</span> <span class="n">to</span><span class="p">:</span> 0
+<span class="n">pre</span><span class="o">-</span><span 
class="n">execution</span><span class="p">:</span> <span class="nb">log</span> 
<span class="n">file</span> <span class="n">being</span> <span 
class="n">used</span><span class="p">:</span> <span class="o">/</span><span 
class="n">var</span><span class="o">/</span><span class="nb">log</span><span 
class="o">/</span><span class="n">vcld</span><span class="p">.</span><span 
class="nb">log</span>
+<span class="n">pre</span><span class="o">-</span><span 
class="n">execution</span><span class="p">:</span> <span class="n">PID</span> 
<span class="n">file</span> <span class="n">being</span> <span 
class="n">used</span><span class="p">:</span> <span class="o">/</span><span 
class="n">var</span><span class="o">/</span><span class="n">run</span><span 
class="o">/</span><span class="n">vcld</span><span class="p">.</span><span 
class="n">pid</span>
+<span class="n">Created</span> <span class="n">process</span> 23696 <span 
class="n">renamed</span> <span class="n">to</span> <span class="n">vcld</span> 
<span class="p">...</span>
                                                       <span class="p">[</span> 
<span class="n">OK</span> <span class="p">]</span>
 </pre></div>
 
@@ -325,7 +325,7 @@ match the name that was configured for t
 <p><strong>tail -f /var/log/vcld.log</strong></p>
 <p>You should see the following being added to the log file every few seconds
 if the management node is checking in with the database:</p>
-<div class="codehilite"><pre><span class="mi">2009</span><span 
class="o">-</span><span class="mo">06</span><span class="o">-</span><span 
class="mi">16</span> <span class="mi">16</span><span class="p">:</span><span 
class="mi">57</span><span class="p">:</span><span class="mi">15</span><span 
class="o">|</span><span class="mi">15792</span><span class="o">|</span><span 
class="n">vcld:main</span><span class="p">(</span><span 
class="mi">165</span><span class="p">)</span><span class="o">|</span><span 
class="n">lastcheckin</span> <span class="nb">time</span> <span 
class="n">updated</span> <span class="k">for</span> <span 
class="n">management</span> <span class="n">node</span> <span 
class="mi">18</span><span class="p">:</span> <span class="mi">2009</span><span 
class="o">-</span><span class="mo">06</span><span class="o">-</span><span 
class="mi">16</span> <span class="mi">16</span><span class="p">:</span><span 
class="mi">57</span><span class="p">:</span><span class="mi">15</span>
+<div class="codehilite"><pre>2009<span class="o">-</span>06<span 
class="o">-</span>16 16<span class="p">:</span>57<span 
class="p">:</span>15<span class="o">|</span>15792<span class="o">|</span><span 
class="n">vcld</span><span class="p">:</span><span class="n">main</span><span 
class="p">(</span>165<span class="p">)</span><span class="o">|</span><span 
class="n">lastcheckin</span> <span class="n">time</span> <span 
class="n">updated</span> <span class="k">for</span> <span 
class="n">management</span> <span class="n">node</span> 18<span 
class="p">:</span> 2009<span class="o">-</span>06<span class="o">-</span>16 
16<span class="p">:</span>57<span class="p">:</span>15
 </pre></div>
 
 
@@ -336,14 +336,14 @@ if the management node is checking in wi
 <p>To insure that the management node can SSH into your virtual machines
 without problems, you will need to edit the SSH client config for the root
 user:</p>
-<div class="codehilite"><pre><span class="n">vi</span> <span 
class="sr">/root/</span><span class="o">.</span><span class="n">ssh</span><span 
class="o">/</span><span class="n">config</span>
+<div class="codehilite"><pre><span class="n">vi</span> <span 
class="o">/</span><span class="n">root</span><span class="o">/</span><span 
class="p">.</span><span class="n">ssh</span><span class="o">/</span><span 
class="n">config</span>
 </pre></div>
 
 
 <p>Add the following lines to the top of the configuration file.</p>
-<div class="codehilite"><pre><span class="n">Host</span> <span 
class="sr">&lt;vmhost&gt;</span> <span class="o">&lt;</span><span 
class="n">vmhost</span> <span class="n">ip</span><span class="o">&gt;</span>
-   <span class="n">UserKnownHostsFile</span> <span 
class="sr">/dev/</span><span class="n">null</span>
-   <span class="n">StrictHostKeyChecking</span> <span class="nb">no</span>
+<div class="codehilite"><pre><span class="n">Host</span> <span 
class="o">&lt;</span><span class="n">vmhost</span><span class="o">&gt;</span> 
<span class="o">&lt;</span><span class="n">vmhost</span> <span 
class="n">ip</span><span class="o">&gt;</span>
+   <span class="n">UserKnownHostsFile</span> <span class="o">/</span><span 
class="n">dev</span><span class="o">/</span><span class="n">null</span>
+   <span class="n">StrictHostKeyChecking</span> <span class="n">no</span>
 </pre></div>
 
 
@@ -386,21 +386,21 @@ then the files contained within can be c
 also some Linux utilities which claim to be able to extract .cab files.</p>
 <p>Copy the extracted Windows XP Sysprep files to the following directory on
 the management node after they have been extracted:</p>
-<div class="codehilite"><pre><span class="sr">/usr/</span><span 
class="nb">local</span><span class="sr">/vcl/</span><span 
class="n">tools</span><span class="sr">/Windows_XP/</span><span 
class="n">Utilities</span><span class="o">/</span><span class="n">Sysprep</span>
+<div class="codehilite"><pre><span class="o">/</span><span 
class="n">usr</span><span class="o">/</span><span class="n">local</span><span 
class="o">/</span><span class="n">vcl</span><span class="o">/</span><span 
class="n">tools</span><span class="o">/</span><span 
class="n">Windows_XP</span><span class="o">/</span><span 
class="n">Utilities</span><span class="o">/</span><span class="n">Sysprep</span>
 </pre></div>
 
 
 <p>Copy the extracted Windows Server 2003 Sysprep files to the
 following directory on the management node after they have been extracted:</p>
-<div class="codehilite"><pre><span class="sr">/usr/</span><span 
class="nb">local</span><span class="sr">/vcl/</span><span 
class="n">tools</span><span class="sr">/Windows_Server_2003/</span><span 
class="n">Utilities</span><span class="o">/</span><span class="n">Sysprep</span>
+<div class="codehilite"><pre><span class="o">/</span><span 
class="n">usr</span><span class="o">/</span><span class="n">local</span><span 
class="o">/</span><span class="n">vcl</span><span class="o">/</span><span 
class="n">tools</span><span class="o">/</span><span 
class="n">Windows_Server_2003</span><span class="o">/</span><span 
class="n">Utilities</span><span class="o">/</span><span class="n">Sysprep</span>
 </pre></div>
 
 
 <p>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:</p>
-<div class="codehilite"><pre><span class="o">-</span><span 
class="n">rw</span><span class="o">-</span><span class="n">rw</span><span 
class="o">-</span><span class="n">r</span><span class="o">-</span> <span 
class="mi">1</span> <span class="n">root</span> <span class="n">root</span> 
<span class="mi">25600</span> <span class="n">Aug</span> <span 
class="mi">18</span> <span class="mi">17</span><span class="p">:</span><span 
class="mi">32</span> <span class="n">setupcl</span><span 
class="o">.</span><span class="n">exe</span>
-<span class="o">-</span><span class="n">rw</span><span class="o">-</span><span 
class="n">rw</span><span class="o">-</span><span class="n">r</span><span 
class="o">-</span> <span class="mi">1</span> <span class="n">root</span> <span 
class="n">root</span> <span class="mi">88576</span> <span class="n">Aug</span> 
<span class="mi">18</span> <span class="mi">17</span><span 
class="p">:</span><span class="mi">32</span> <span 
class="n">sysprep</span><span class="o">.</span><span class="n">exe</span>
+<div class="codehilite"><pre><span class="o">-</span><span 
class="n">rw</span><span class="o">-</span><span class="n">rw</span><span 
class="o">-</span><span class="n">r</span><span class="o">-</span> 1 <span 
class="n">root</span> <span class="n">root</span> 25600 <span 
class="n">Aug</span> 18 17<span class="p">:</span>32 <span 
class="n">setupcl</span><span class="p">.</span><span class="n">exe</span>
+<span class="o">-</span><span class="n">rw</span><span class="o">-</span><span 
class="n">rw</span><span class="o">-</span><span class="n">r</span><span 
class="o">-</span> 1 <span class="n">root</span> <span class="n">root</span> 
88576 <span class="n">Aug</span> 18 17<span class="p">:</span>32 <span 
class="n">sysprep</span><span class="p">.</span><span class="n">exe</span>
 </pre></div>
 
 
@@ -408,7 +408,7 @@ contain the following files at a minimum
 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:</p>
-<div class="codehilite"><pre><span class="sr">/usr/</span><span 
class="nb">local</span><span class="sr">/vcl/</span><span 
class="n">bin</span><span class="o">/</span><span class="n">vcld</span> <span 
class="o">-</span><span class="n">setup</span>
+<div class="codehilite"><pre><span class="o">/</span><span 
class="n">usr</span><span class="o">/</span><span class="n">local</span><span 
class="o">/</span><span class="n">vcl</span><span class="o">/</span><span 
class="n">bin</span><span class="o">/</span><span class="n">vcld</span> <span 
class="o">-</span><span class="n">setup</span>
 </pre></div>
 
 

Modified: 
websites/staging/vcl/trunk/content/docs/archives/old-releases/adding-ldap-authentication.html
==============================================================================
--- 
websites/staging/vcl/trunk/content/docs/archives/old-releases/adding-ldap-authentication.html
 (original)
+++ 
websites/staging/vcl/trunk/content/docs/archives/old-releases/adding-ldap-authentication.html
 Fri Feb 13 19:07:47 2015
@@ -104,7 +104,7 @@ generate the lines that need to be added
 <li>
 <p>You can verify that the certificate is properly installed using this
 command:</p>
-<div class="codehilite"><pre><span class="n">openssl</span> <span 
class="n">s_client</span> <span class="o">-</span><span 
class="n">showcerts</span> <span class="o">-</span><span 
class="n">CAfile</span> <span class="sr">/etc/</span><span 
class="n">pki</span><span class="sr">/tls/c</span><span 
class="n">erts</span><span class="o">/</span><span class="n">ca</span><span 
class="o">-</span><span class="n">bundle</span><span class="o">.</span><span 
class="n">crt</span> <span class="o">-</span><span class="nb">connect</span> 
<span class="n">your</span><span class="o">.</span><span 
class="n">ldap</span><span class="o">.</span><span class="n">server</span><span 
class="o">.</span><span class="n">here:636</span>
+<div class="codehilite"><pre><span class="n">openssl</span> <span 
class="n">s_client</span> <span class="o">-</span><span 
class="n">showcerts</span> <span class="o">-</span><span 
class="n">CAfile</span> <span class="o">/</span><span class="n">etc</span><span 
class="o">/</span><span class="n">pki</span><span class="o">/</span><span 
class="n">tls</span><span class="o">/</span><span class="n">certs</span><span 
class="o">/</span><span class="n">ca</span><span class="o">-</span><span 
class="n">bundle</span><span class="p">.</span><span class="n">crt</span> <span 
class="o">-</span><span class="n">connect</span> <span 
class="n">your</span><span class="p">.</span><span class="n">ldap</span><span 
class="p">.</span><span class="n">server</span><span class="p">.</span><span 
class="n">here</span><span class="p">:</span>636
 </pre></div>
 
 
@@ -131,8 +131,8 @@ chose. Take note of the id from the 2nd
 later. It is the affiliationid for this affiliation.</p>
 <div class="codehilite"><pre><span class="n">mysql</span> <span 
class="n">vcl</span>
 <span class="n">INSERT</span> <span class="n">INTO</span> <span 
class="n">affiliation</span> <span class="p">(</span><span 
class="n">name</span><span class="p">)</span> <span class="n">VALUES</span> 
<span class="p">(</span><span class="s">&#39;EXAMPLE&#39;</span><span 
class="p">);</span>
-<span class="n">SELECT</span> <span class="n">id</span> <span 
class="n">FROM</span> <span class="n">affiliation</span> <span 
class="n">WHERE</span> <span class="n">name</span> <span class="o">=</span> 
<span class="s">&#39;EXAMPLE&#39;</span><span class="p">;</span>
-<span class="nb">exit</span>
+<span class="n">SELECT</span> <span class="n">id</span> <span 
class="n">FROM</span> <span class="n">affiliation</span> <span 
class="n">WHERE</span> <span class="n">name</span> <span class="p">=</span> 
<span class="s">&#39;EXAMPLE&#39;</span><span class="p">;</span>
+<span class="n">exit</span>
 </pre></div>
 
 
@@ -183,25 +183,25 @@ option</li>
 replaced with a block of code.</li>
 <li>
 <p>Delete the following lines:</p>
-<div class="codehilite"><pre><span class="nv">$affilValFunc</span> <span 
class="o">=</span> <span class="n">array</span><span class="p">(</span><span 
class="mi">1</span> <span class="o">=&gt;</span> <span 
class="n">create_function</span><span class="p">(</span><span 
class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 
0;&#39;</span><span class="p">),</span>
-              <span class="sr">/*3 =&gt; &quot;validateLDAPUser&quot;,*/</span>
+<div class="codehilite"><pre>$<span class="n">affilValFunc</span> <span 
class="p">=</span> <span class="n">array</span><span class="p">(</span>1 <span 
class="p">=</span><span class="o">&gt;</span> <span 
class="n">create_function</span><span class="p">(</span><span 
class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 
0;&#39;</span><span class="p">),</span>
+              <span class="o">/*</span>3 <span class="p">=</span><span 
class="o">&gt;</span> &quot;<span class="n">validateLDAPUser</span>&quot;<span 
class="p">,</span><span class="o">*/</span>
 <span class="p">);</span>
 
-<span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">(</span><span class="sr">/*3 =&gt; 
&#39;EXAMPLE1 LDAP&#39;,*/</span>
+$<span class="n">affilValFuncArgs</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">(</span><span class="o">/*</span>3 <span 
class="p">=</span><span class="o">&gt;</span> <span class="s">&#39;EXAMPLE1 
LDAP&#39;</span><span class="p">,</span><span class="o">*/</span>
 <span class="p">);</span>
 
-<span class="nv">$addUserFunc</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">(</span><span class="mi">1</span> <span 
class="o">=&gt;</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">),</span>
-             <span class="sr">/*3 =&gt; &#39;addLDAPUser&#39;,*/</span>
+$<span class="n">addUserFunc</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">(</span>1 <span class="p">=</span><span 
class="o">&gt;</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">),</span>
+             <span class="o">/*</span>3 <span class="p">=</span><span 
class="o">&gt;</span> <span class="s">&#39;addLDAPUser&#39;</span><span 
class="p">,</span><span class="o">*/</span>
 <span class="p">);</span>
 
-<span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">(</span><span class="sr">/*3 =&gt; 
&#39;EXAMPLE1 LDAP&#39;,*/</span>
+$<span class="n">addUserFuncArgs</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">(</span><span class="o">/*</span>3 <span 
class="p">=</span><span class="o">&gt;</span> <span class="s">&#39;EXAMPLE1 
LDAP&#39;</span><span class="p">,</span><span class="o">*/</span>
 <span class="p">);</span>
 
-<span class="nv">$updateUserFunc</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">(</span><span class="mi">1</span> <span 
class="o">=&gt;</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">),</span>
-            <span class="sr">/*3 =&gt; &#39;updateLDAPUser&#39;,*/</span>
+$<span class="n">updateUserFunc</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">(</span>1 <span class="p">=</span><span 
class="o">&gt;</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">),</span>
+            <span class="o">/*</span>3 <span class="p">=</span><span 
class="o">&gt;</span> <span class="s">&#39;updateLDAPUser&#39;</span><span 
class="p">,</span><span class="o">*/</span>
 <span class="p">);</span>
 
-<span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">(</span><span class="sr">/*3 =&gt; 
&#39;EXAMPLE1 LDAP&#39;,*/</span>
+$<span class="n">updateUserFuncArgs</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">(</span><span class="o">/*</span>3 <span 
class="p">=</span><span class="o">&gt;</span> <span class="s">&#39;EXAMPLE1 
LDAP&#39;</span><span class="p">,</span><span class="o">*/</span>
 <span class="p">);</span>
 </pre></div>
 
@@ -209,25 +209,25 @@ replaced with a block of code.</li>
 </li>
 </ul>
 <p>and replace them with</p>
-<div class="codehilite"><pre>    <span class="nv">$affilValFunc</span> <span 
class="o">=</span> <span class="n">array</span><span class="p">();</span>
-    <span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">();</span>
-    <span class="nv">$addUserFunc</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">();</span>
-    <span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">();</span>
-    <span class="nv">$updateUserFunc</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">();</span>
-    <span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span 
class="n">array</span><span class="p">();</span>
-    <span class="k">foreach</span><span class="p">(</span><span 
class="nv">$authMechs</span> <span class="n">as</span> <span 
class="nv">$key</span> <span class="o">=&gt;</span> <span 
class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
-       <span class="k">if</span><span class="p">(</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;type&#39;</span><span class="p">]</span> <span 
class="o">==</span> <span class="s">&#39;ldap&#39;</span><span 
class="p">)</span> <span class="p">{</span>
-          <span class="nv">$affilValFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="s">&#39;validateLDAPUser&#39;</span><span 
class="p">;</span>
-          <span class="nv">$affilValFuncArgs</span><span 
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
-          <span class="nv">$addUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="s">&#39;addLDAPUser&#39;</span><span 
class="p">;</span>
-          <span class="nv">$addUserFuncArgs</span><span 
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
-          <span class="nv">$updateUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="s">&#39;updateLDAPUser&#39;</span><span 
class="p">;</span>
-          <span class="nv">$updateUserFuncArgs</span><span 
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+<div class="codehilite"><pre>    $<span class="n">affilValFunc</span> <span 
class="p">=</span> <span class="n">array</span><span class="p">();</span>
+    $<span class="n">affilValFuncArgs</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">();</span>
+    $<span class="n">addUserFunc</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">();</span>
+    $<span class="n">addUserFuncArgs</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">();</span>
+    $<span class="n">updateUserFunc</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">();</span>
+    $<span class="n">updateUserFuncArgs</span> <span class="p">=</span> <span 
class="n">array</span><span class="p">();</span>
+    <span class="n">foreach</span><span class="p">(</span>$<span 
class="n">authMechs</span> <span class="n">as</span> $<span 
class="n">key</span> <span class="p">=</span><span class="o">&gt;</span> $<span 
class="n">item</span><span class="p">)</span> <span class="p">{</span>
+       <span class="k">if</span><span class="p">(</span>$<span 
class="n">item</span><span class="p">[</span><span 
class="s">&#39;type&#39;</span><span class="p">]</span> <span 
class="o">==</span> <span class="s">&#39;ldap&#39;</span><span 
class="p">)</span> <span class="p">{</span>
+          $<span class="n">affilValFunc</span><span class="p">[</span>$<span 
class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> <span class="s">&#39;validateLDAPUser&#39;</span><span 
class="p">;</span>
+          $<span class="n">affilValFuncArgs</span><span 
class="p">[</span>$<span class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> $<span class="n">key</span><span class="p">;</span>
+          $<span class="n">addUserFunc</span><span class="p">[</span>$<span 
class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> <span class="s">&#39;addLDAPUser&#39;</span><span 
class="p">;</span>
+          $<span class="n">addUserFuncArgs</span><span 
class="p">[</span>$<span class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> $<span class="n">key</span><span class="p">;</span>
+          $<span class="n">updateUserFunc</span><span class="p">[</span>$<span 
class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> <span class="s">&#39;updateLDAPUser&#39;</span><span 
class="p">;</span>
+          $<span class="n">updateUserFuncArgs</span><span 
class="p">[</span>$<span class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> $<span class="n">key</span><span class="p">;</span>
        <span class="p">}</span>
-       <span class="n">elseif</span><span class="p">(</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;type&#39;</span><span class="p">]</span> <span 
class="o">==</span> <span class="s">&#39;local&#39;</span><span 
class="p">)</span> <span class="p">{</span>
-          <span class="nv">$affilValFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
-          <span class="nv">$addUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
-          <span class="nv">$updateUserFunc</span><span class="p">[</span><span 
class="nv">$item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="o">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
+       <span class="k">elseif</span><span class="p">(</span>$<span 
class="n">item</span><span class="p">[</span><span 
class="s">&#39;type&#39;</span><span class="p">]</span> <span 
class="o">==</span> <span class="s">&#39;local&#39;</span><span 
class="p">)</span> <span class="p">{</span>
+          $<span class="n">affilValFunc</span><span class="p">[</span>$<span 
class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
+          $<span class="n">addUserFunc</span><span class="p">[</span>$<span 
class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
+          $<span class="n">updateUserFunc</span><span class="p">[</span>$<span 
class="n">item</span><span class="p">[</span><span 
class="s">&#39;affiliationid&#39;</span><span class="p">]]</span> <span 
class="p">=</span> <span class="n">create_function</span><span 
class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> 
<span class="s">&#39;return 0;&#39;</span><span class="p">);</span>
        <span class="p">}</span>
     <span class="p">}</span>
 </pre></div>

Modified: 
websites/staging/vcl/trunk/content/docs/archives/old-releases/upgrade-from-previous-version.html
==============================================================================
--- 
websites/staging/vcl/trunk/content/docs/archives/old-releases/upgrade-from-previous-version.html
 (original)
+++ 
websites/staging/vcl/trunk/content/docs/archives/old-releases/upgrade-from-previous-version.html
 Fri Feb 13 19:07:47 2015
@@ -96,7 +96,7 @@ changes</li>
 put in in /root</li>
 <li>
 <p>extract VCL 2.2 code</p>
-<div class="codehilite"><pre><span class="n">tar</span> <span 
class="n">xjf</span> <span class="n">apache</span><span class="o">-</span><span 
class="n">VCL</span><span class="o">-</span><span class="mf">2.2</span><span 
class="o">-</span><span class="n">incubating</span><span 
class="o">.</span><span class="n">tar</span><span class="o">.</span><span 
class="n">bz2</span>
+<div class="codehilite"><pre><span class="n">tar</span> <span 
class="n">xjf</span> <span class="n">apache</span><span class="o">-</span><span 
class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>2<span 
class="o">-</span><span class="n">incubating</span><span 
class="p">.</span><span class="n">tar</span><span class="p">.</span><span 
class="n">bz2</span>
 </pre></div>
 
 
@@ -105,8 +105,8 @@ put in in /root</li>
 <p><a name="UpgradeFromPreviousVersion-*Shutdownservices*"></a></p>
 <h2 id="shutdown-services">Shutdown services</h2>
 <p>Shutdown the httpd and vcld services</p>
-<div class="codehilite"><pre>    <span class="n">service</span> <span 
class="n">httpd</span> <span class="n">stop</span> <span class="ow">or</span> 
<span class="sr">/etc/i</span><span class="n">nit</span><span 
class="o">.</span><span class="n">d</span><span class="o">/</span><span 
class="n">httpd</span> <span class="n">stop</span>
-    <span class="n">service</span> <span class="n">vcld</span> <span 
class="n">stop</span> <span class="ow">or</span> <span 
class="sr">/etc/i</span><span class="n">nit</span><span class="o">.</span><span 
class="n">d</span><span class="o">/</span><span class="n">vcld</span> <span 
class="n">stop</span>
+<div class="codehilite"><pre>    <span class="n">service</span> <span 
class="n">httpd</span> <span class="n">stop</span> <span class="n">or</span> 
<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span 
class="n">init</span><span class="p">.</span><span class="n">d</span><span 
class="o">/</span><span class="n">httpd</span> <span class="n">stop</span>
+    <span class="n">service</span> <span class="n">vcld</span> <span 
class="n">stop</span> <span class="n">or</span> <span class="o">/</span><span 
class="n">etc</span><span class="o">/</span><span class="n">init</span><span 
class="p">.</span><span class="n">d</span><span class="o">/</span><span 
class="n">vcld</span> <span class="n">stop</span>
 </pre></div>
 
 
@@ -114,15 +114,15 @@ put in in /root</li>
 <h2 id="create-a-backup-of-vcl-database">Create a backup of vcl database</h2>
 <p>We will create a backup of the vcl database. This will provide a restore
 point if necessary.</p>
-<div class="codehilite"><pre>    <span class="n">mysqldump</span> <span 
class="n">vcl</span> <span class="o">&gt;</span> <span class="o">~/</span><span 
class="n">vcl</span><span class="o">-</span><span class="n">pre2</span><span 
class="mf">.2</span><span class="o">-</span><span class="n">upgrade</span><span 
class="o">.</span><span class="n">sql</span>
+<div class="codehilite"><pre>    <span class="n">mysqldump</span> <span 
class="n">vcl</span> <span class="o">&gt;</span> <span class="o">~/</span><span 
class="n">vcl</span><span class="o">-</span><span class="n">pre2</span><span 
class="p">.</span>2<span class="o">-</span><span class="n">upgrade</span><span 
class="p">.</span><span class="n">sql</span>
 </pre></div>
 
 
 <p><a name="UpgradeFromPreviousVersion-*Updatemysqlschema*"></a></p>
 <h2 id="update-mysql-schema">Update mysql schema</h2>
 <p>This step updates the mysql schema.</p>
-<div class="codehilite"><pre>    <span class="n">cd</span> <span 
class="sr">/root/</span><span class="n">apache</span><span 
class="o">-</span><span class="n">VCL</span><span class="o">-</span><span 
class="mf">2.2</span><span class="o">-</span><span class="n">incubating</span>
-    <span class="n">mysql</span> <span class="n">vcl</span> <span 
class="o">&lt;</span> <span class="n">mysql</span><span class="o">/</span><span 
class="n">update</span><span class="o">-</span><span class="mf">2.2</span><span 
class="o">.</span><span class="n">sql</span>
+<div class="codehilite"><pre>    <span class="n">cd</span> <span 
class="o">/</span><span class="n">root</span><span class="o">/</span><span 
class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span 
class="o">-</span>2<span class="p">.</span>2<span class="o">-</span><span 
class="n">incubating</span>
+    <span class="n">mysql</span> <span class="n">vcl</span> <span 
class="o">&lt;</span> <span class="n">mysql</span><span class="o">/</span><span 
class="n">update</span><span class="o">-</span>2<span class="p">.</span>2<span 
class="p">.</span><span class="n">sql</span>
 </pre></div>
 
 
@@ -136,24 +136,24 @@ replace /var/www/html/vcl with your vcl
 <ol>
 <li>
 <p>copy your old code out of the way</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span 
class="sr">/var/</span><span class="n">www</span><span class="o">/</span><span 
class="n">html</span>
-<span class="n">mv</span> <span class="n">vcl</span> <span 
class="o">~/</span><span class="n">vcl_2</span><span class="mf">.1_</span><span 
class="n">web</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span 
class="o">/</span><span class="n">var</span><span class="o">/</span><span 
class="n">www</span><span class="o">/</span><span class="n">html</span>
+<span class="n">mv</span> <span class="n">vcl</span> <span 
class="o">~/</span><span class="n">vcl_2</span><span class="p">.</span>1<span 
class="n">_web</span>
 </pre></div>
 
 
 </li>
 <li>
 <p>copy the new code in place</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span 
class="sr">/root/</span><span class="n">apache</span><span 
class="o">-</span><span class="n">VCL</span><span class="o">-</span><span 
class="mf">2.2</span><span class="o">-</span><span class="n">incubating</span>
-<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> 
<span class="n">web</span> <span class="sr">/var/</span><span 
class="n">www</span><span class="sr">/html/</span><span class="n">vcl</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span 
class="o">/</span><span class="n">root</span><span class="o">/</span><span 
class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span 
class="o">-</span>2<span class="p">.</span>2<span class="o">-</span><span 
class="n">incubating</span>
+<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> 
<span class="n">web</span> <span class="o">/</span><span 
class="n">var</span><span class="o">/</span><span class="n">www</span><span 
class="o">/</span><span class="n">html</span><span class="o">/</span><span 
class="n">vcl</span>
 </pre></div>
 
 
 </li>
 <li>
 <p>copy your 2.1 config files</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span 
class="o">~</span><span class="sr">/vcl_2.1_web/</span><span 
class="o">.</span><span class="n">ht</span><span class="o">-</span><span 
class="n">inc</span>
-<span class="n">cp</span> <span class="n">conf</span><span 
class="o">.</span><span class="n">php</span> <span 
class="n">secrets</span><span class="o">.</span><span class="n">php</span> 
<span class="n">pubkey</span><span class="o">.</span><span class="n">pem</span> 
<span class="nb">keys</span><span class="o">.</span><span class="n">pem</span> 
<span class="sr">/var/</span><span class="n">www</span><span 
class="sr">/html/</span><span class="n">vcl</span><span 
class="o">/.</span><span class="n">ht</span><span class="o">-</span><span 
class="n">inc</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span 
class="o">~/</span><span class="n">vcl_2</span><span class="p">.</span>1<span 
class="n">_web</span><span class="o">/</span><span class="p">.</span><span 
class="n">ht</span><span class="o">-</span><span class="n">inc</span>
+<span class="n">cp</span> <span class="n">conf</span><span 
class="p">.</span><span class="n">php</span> <span 
class="n">secrets</span><span class="p">.</span><span class="n">php</span> 
<span class="n">pubkey</span><span class="p">.</span><span class="n">pem</span> 
<span class="n">keys</span><span class="p">.</span><span class="n">pem</span> 
<span class="o">/</span><span class="n">var</span><span class="o">/</span><span 
class="n">www</span><span class="o">/</span><span class="n">html</span><span 
class="o">/</span><span class="n">vcl</span><span class="o">/</span><span 
class="p">.</span><span class="n">ht</span><span class="o">-</span><span 
class="n">inc</span>
 </pre></div>
 
 
@@ -161,7 +161,7 @@ replace /var/www/html/vcl with your vcl
 <li>
 <p>make /var/www/html/vcl/.ht-inc/maintenance writable by the web server -
 if httpd on your server is running as the user apache:</p>
-<div class="codehilite"><pre><span class="nb">chown</span> <span 
class="n">apache</span> <span class="sr">/var/</span><span 
class="n">www</span><span class="sr">/html/</span><span 
class="n">vcl</span><span class="sr">/.ht-inc/m</span><span 
class="n">aintenance</span>
+<div class="codehilite"><pre><span class="n">chown</span> <span 
class="n">apache</span> <span class="o">/</span><span class="n">var</span><span 
class="o">/</span><span class="n">www</span><span class="o">/</span><span 
class="n">html</span><span class="o">/</span><span class="n">vcl</span><span 
class="o">/</span><span class="p">.</span><span class="n">ht</span><span 
class="o">-</span><span class="n">inc</span><span class="o">/</span><span 
class="n">maintenance</span>
 </pre></div>
 
 
@@ -181,7 +181,7 @@ conf-default.php</p>
 </ol>
 <p><a name="UpgradeFromPreviousVersion-Restarthttpdservice"></a></p>
 <h2 id="restart-httpd-service">Restart httpd service</h2>
-<div class="codehilite"><pre><span class="n">service</span> <span 
class="n">httpd</span> <span class="n">start</span> <span class="ow">or</span> 
<span class="sr">/etc/i</span><span class="n">nit</span><span 
class="o">.</span><span class="n">d</span><span class="o">/</span><span 
class="n">httpd</span> <span class="n">start</span>
+<div class="codehilite"><pre><span class="n">service</span> <span 
class="n">httpd</span> <span class="n">start</span> <span class="n">or</span> 
<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span 
class="n">init</span><span class="p">.</span><span class="n">d</span><span 
class="o">/</span><span class="n">httpd</span> <span class="n">start</span>
 </pre></div>
 
 
@@ -193,8 +193,8 @@ copy in the new management node(MN) code
 <li>
 <p>Copy 2.1 code base to a backup location</p>
 <div class="codehilite"><pre><span class="n">cd</span> <span 
class="o">&lt;</span><span class="n">your</span> <span class="n">vcl</span> 
<span class="n">MN</span> <span class="n">code</span> <span 
class="n">root</span> <span class="n">path</span><span class="o">&gt;</span>
-<span class="n">ie</span><span class="o">.</span> <span class="n">cd</span> 
<span class="sr">/usr/</span><span class="nb">local</span><span 
class="o">/</span>
-<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> 
<span class="n">vcl</span> <span class="o">~/</span><span 
class="n">vcl_2</span><span class="mf">.1_</span><span 
class="n">managementnode</span>
+<span class="n">ie</span><span class="p">.</span> <span class="n">cd</span> 
<span class="o">/</span><span class="n">usr</span><span class="o">/</span><span 
class="n">local</span><span class="o">/</span>
+<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> 
<span class="n">vcl</span> <span class="o">~/</span><span 
class="n">vcl_2</span><span class="p">.</span>1<span 
class="n">_managementnode</span>
 </pre></div>
 
 
@@ -202,7 +202,7 @@ copy in the new management node(MN) code
 <li>
 <p>Copy in the 2.2 code base to /usr/local, copying in should preserve any
 drivers or other files you've added.</p>
-<div class="codehilite"><pre><span class="sr">/bin/c</span><span 
class="n">p</span> <span class="o">-</span><span class="n">r</span> <span 
class="sr">/root/</span><span class="n">apache</span><span 
class="o">-</span><span class="n">VCL</span><span class="o">-</span><span 
class="mf">2.2</span><span class="o">-</span><span 
class="n">incubating</span><span class="sr">/managementnode/</span><span 
class="o">*</span> <span class="sr">/usr/</span><span 
class="nb">local</span><span class="o">/</span><span class="n">vcl</span>
+<div class="codehilite"><pre><span class="o">/</span><span 
class="n">bin</span><span class="o">/</span><span class="n">cp</span> <span 
class="o">-</span><span class="n">r</span> <span class="o">/</span><span 
class="n">root</span><span class="o">/</span><span class="n">apache</span><span 
class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span 
class="p">.</span>2<span class="o">-</span><span 
class="n">incubating</span><span class="o">/</span><span 
class="n">managementnode</span><span class="o">/*</span> <span 
class="o">/</span><span class="n">usr</span><span class="o">/</span><span 
class="n">local</span><span class="o">/</span><span class="n">vcl</span>
 </pre></div>
 
 
@@ -225,7 +225,7 @@ is used, options are dynamic DHCP, Manua
 </ol>
 <p><a name="UpgradeFromPreviousVersion-Restartvcldservice"></a></p>
 <h2 id="restart-vcld-service">Restart vcld service</h2>
-<div class="codehilite"><pre>    <span class="n">service</span> <span 
class="n">vcld</span> <span class="n">start</span> <span class="ow">or</span> 
<span class="sr">/etc/i</span><span class="n">nit</span><span 
class="o">.</span><span class="n">d</span><span class="o">/</span><span 
class="n">vcld</span> <span class="n">start</span>
+<div class="codehilite"><pre>    <span class="n">service</span> <span 
class="n">vcld</span> <span class="n">start</span> <span class="n">or</span> 
<span class="o">/</span><span class="n">etc</span><span class="o">/</span><span 
class="n">init</span><span class="p">.</span><span class="n">d</span><span 
class="o">/</span><span class="n">vcld</span> <span class="n">start</span>
 </pre></div>
   </div>
   

Modified: 
websites/staging/vcl/trunk/content/docs/archives/old-releases/vcl-2.2.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/archives/old-releases/vcl-2.2.html 
(original)
+++ websites/staging/vcl/trunk/content/docs/archives/old-releases/vcl-2.2.html 
Fri Feb 13 19:07:47 2015
@@ -76,24 +76,20 @@
 <ul>
 <li><a href="#download-links">Download links</a></li>
 <li><a href="#release-notes">Release Notes</a><ul>
-<li><a href="#i-intro-and-description">I. Intro and Description</a><ul>
+<li><a href="#i-intro-and-description">I. Intro and Description</a></li>
 <li><a href="#ii-vcl-roadmap">II. VCL Roadmap</a></li>
 <li><a href="#iii-getting-involved-in-the-asf-vcl-community">III. Getting 
Involved in the ASF VCL Community</a></li>
 <li><a href="#iv-how-to-submit-bugs-and-feature-requests">IV. How to Submit 
Bugs and Feature Requests</a></li>
 </ul>
 </li>
-</ul>
-</li>
 <li><a href="#change-log">Change Log</a><ul>
-<li><a href="#bug">Bug</a><ul>
+<li><a href="#bug">Bug</a></li>
 <li><a href="#improvement">Improvement</a></li>
 <li><a href="#new-feature">New Feature</a></li>
 <li><a href="#task">Task</a></li>
 </ul>
 </li>
 </ul>
-</li>
-</ul>
 </div>
 <p><a name="VCL2.2-Downloadlinks"></a></p>
 <h2 id="download-links">Download links</h2>
@@ -109,13 +105,13 @@ Apache, not from mirrors).</p>
 <a href="http://www.apache.org/dist/vcl/KEYS";>VCL KEYS file</a></p>
 <p>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:</p>
-<div class="codehilite"><pre><span class="n">md5sum</span> <span 
class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span 
class="o">-</span><span class="mf">2.2</span><span class="o">-</span><span 
class="n">incubating</span><span class="o">.</span><span 
class="n">tar</span><span class="o">.</span><span class="n">bz2</span>
+<div class="codehilite"><pre><span class="n">md5sum</span> <span 
class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span 
class="o">-</span>2<span class="p">.</span>2<span class="o">-</span><span 
class="n">incubating</span><span class="p">.</span><span 
class="n">tar</span><span class="p">.</span><span class="n">bz2</span>
 </pre></div>
 
 
 <p>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:</p>
-<div class="codehilite"><pre><span class="n">sha1sum</span> <span 
class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span 
class="o">-</span><span class="mf">2.2</span><span class="o">-</span><span 
class="n">incubating</span><span class="o">.</span><span 
class="n">tar</span><span class="o">.</span><span class="n">bz2</span>
+<div class="codehilite"><pre><span class="n">sha1sum</span> <span 
class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span 
class="o">-</span>2<span class="p">.</span>2<span class="o">-</span><span 
class="n">incubating</span><span class="p">.</span><span 
class="n">tar</span><span class="p">.</span><span class="n">bz2</span>
 </pre></div>
 
 
@@ -275,8 +271,7 @@ on load </li>
 ] -         Marking new computer to be &quot;maintenance&quot; status
 causes indexing error </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-197";>VCL-197</a>
-] -         _is_user_added routine<br />
-</li>
+] -         _is_user_added routine  </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-210";>VCL-210</a>
 ] -         getdynamicaddress returns 127.0.01 for missing public adapter </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-214";>VCL-214</a>
@@ -301,8 +296,7 @@ future reservations that are preloaded <
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-242";>VCL-242</a>
 ] -         currentimage.txt permissions incorrect set </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-245";>VCL-245</a>
-] -         esx.pm - always reloads<br />
-</li>
+] -         esx.pm - always reloads  </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-250";>VCL-250</a>
 ] -         authentication for XML RPC X-User doesn't properly check to
 see if no authtype was found </li>
@@ -319,8 +313,7 @@ true even if output contains &quot;file
 right for existing accounts </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-265";>VCL-265</a>
 ] -         Linux adduser cmd - remove uid parameter if uid not defined in
-user table<br />
-</li>
+user table  </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-266";>VCL-266</a>
 ] -         New process detects another reload process being complete
 before it should </li>
@@ -363,8 +356,7 @@ Task names when changing passwords </li>
 ] -         cannot delete block requests once the start date has passed </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-333";>VCL-333</a>
 ] -         DataStructure %ENV hash not get detected in _initialize
-routine<br />
-</li>
+routine  </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-334";>VCL-334</a>
 ] -         numeric userids are not handled correctly </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-337";>VCL-337</a>
@@ -450,8 +442,7 @@ ADMIN_DEVELOPER </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-155";>VCL-155</a>
 ] -         Decrease initial Current Reservation page refresh interval </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-161";>VCL-161</a>
-] -         remove  xmlrpcKey table from vcl.sql<br />
-</li>
+] -         remove  xmlrpcKey table from vcl.sql  </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-162";>VCL-162</a>
 ] -         create structure to add throttling to provisioning modules </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-163";>VCL-163</a>
@@ -536,8 +527,7 @@ root/administrator access </li>
 ] -         add linux support for all VMWare modules </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-180";>VCL-180</a>
 ] -         add power_X(off,on,reset,status)  routines to provisioning
-modules<br />
-</li>
+modules  </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-182";>VCL-182</a>
 ] -         Linux virtual machine support </li>
 <li>[<a href="https://issues.apache.org/jira/browse/VCL-195";>VCL-195</a>

Modified: websites/staging/vcl/trunk/content/docs/assignvmtohost.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/assignvmtohost.html (original)
+++ websites/staging/vcl/trunk/content/docs/assignvmtohost.html Fri Feb 13 
19:07:47 2015
@@ -72,7 +72,11 @@
   
   <div id="content">
     <h1 class="title">Assign Virtual Machine(s) to a Virtual Host</h1>
-    <ol>
+    <div class="codehilite"><pre>
+</pre></div>
+
+
+<ol>
 <li>Click Virtual Hosts</li>
 <li>On the VM Hosts tab, select the virtual host server added
         previously</li>
@@ -84,7 +88,7 @@
         to run on this host</p>
 <div class="codehilite"><pre>   <span class="n">Please</span> <span 
class="n">consult</span> <span class="n">your</span> <span 
class="n">hypervisor</span> <span class="n">documentation</span> <span 
class="k">for</span> <span class="n">the</span> <span 
class="n">recommended</span>
    <span class="n">number</span> <span class="n">of</span> <span 
class="n">virtual</span> <span class="n">machines</span> <span 
class="n">to</span> <span class="n">run</span> <span 
class="n">concurrently</span> <span class="k">for</span> <span 
class="n">your</span> <span class="n">virtual</span>
-   <span class="n">server</span> <span class="n">configuration</span><span 
class="o">.</span>
+   <span class="n">server</span> <span class="n">configuration</span><span 
class="p">.</span>
 </pre></div>
 
 

Modified: 
websites/staging/vcl/trunk/content/docs/configure-the-default-profile.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/configure-the-default-profile.html 
(original)
+++ websites/staging/vcl/trunk/content/docs/configure-the-default-profile.html 
Fri Feb 13 19:07:47 2015
@@ -187,7 +187,7 @@ C:\Users\<strong>Default</strong><br/>
 <em>Note: if you are unable to rename the VCLProfile folder, reboot the 
computer,
 login as Administrator, and try again.  Run the following command from a
 command prompt to reboot the computer:</em></p>
-<div class="codehilite"><pre><span class="nb">shutdown</span><span 
class="o">.</span><span class="n">exe</span> <span class="o">-</span><span 
class="n">r</span> <span class="o">-</span><span class="n">f</span> <span 
class="o">-</span><span class="n">t</span> <span class="mi">0</span>
+<div class="codehilite"><pre><span class="n">shutdown</span><span 
class="p">.</span><span class="n">exe</span> <span class="o">-</span><span 
class="n">r</span> <span class="o">-</span><span class="n">f</span> <span 
class="o">-</span><span class="n">t</span> 0
 </pre></div>
 
 

Modified: websites/staging/vcl/trunk/content/docs/increasevmhdd.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/increasevmhdd.html (original)
+++ websites/staging/vcl/trunk/content/docs/increasevmhdd.html Fri Feb 13 
19:07:47 2015
@@ -104,7 +104,7 @@
 
 
 <p>A full copy of the master image and delta files needs to be created in 
order to be able to resize the virtual disk. Run the following command from the 
VM's working directory on the VM host:</p>
-<div class="codehilite"><pre><span class="n">vmkfstools</span> <span 
class="o">-</span><span class="n">i</span> <span 
class="n">vmwarewin7</span><span class="o">-</span><span 
class="n">Windows764bit1846</span><span class="o">-</span><span 
class="n">v14</span><span class="o">-</span><span class="mo">000001</span><span 
class="o">.</span><span class="n">vmdk</span> <span class="n">copy</span><span 
class="o">.</span><span class="n">vmdk</span> <span class="o">-</span><span 
class="n">d</span> <span class="n">thin</span>
+<div class="codehilite"><pre><span class="n">vmkfstools</span> <span 
class="o">-</span><span class="nb">i</span> <span 
class="n">vmwarewin7</span><span class="o">-</span><span 
class="n">Windows764bit1846</span><span class="o">-</span><span 
class="n">v14</span><span class="o">-</span>000001<span class="p">.</span><span 
class="n">vmdk</span> <span class="n">copy</span><span class="p">.</span><span 
class="n">vmdk</span> <span class="o">-</span><span class="n">d</span> <span 
class="n">thin</span>
 </pre></div>
 
 
@@ -118,7 +118,7 @@ Clone: 100% done.
 
 <p><strong>Resize the Virtual Disk</strong></p>
 <p>Run the following command to resize the virtual disk. The -X argument 
should specify the total size you want the virtual disk to be, not the amount 
of space to add to it:</p>
-<div class="codehilite"><pre><span class="n">vmkfstools</span> <span 
class="o">-</span><span class="n">X</span> <span class="mi">50</span><span 
class="n">G</span> <span class="n">copy</span><span class="o">.</span><span 
class="n">vmdk</span>
+<div class="codehilite"><pre><span class="n">vmkfstools</span> <span 
class="o">-</span><span class="n">X</span> 50<span class="n">G</span> <span 
class="n">copy</span><span class="p">.</span><span class="n">vmdk</span>
 </pre></div>
 
 

Modified: websites/staging/vcl/trunk/content/docs/installphpmyadmin.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/installphpmyadmin.html (original)
+++ websites/staging/vcl/trunk/content/docs/installphpmyadmin.html Fri Feb 13 
19:07:47 2015
@@ -83,7 +83,8 @@ the VCL web server.
 <p>Download phpMyAdmin</p>
 <p>a. Check the version of PHP installed on the web server (you may need to 
perform step 
 1a of <a href="VCL232InstallGuide.html">VCL 2.3.2 Web Code Installation</a> to 
install httpd and php first):</p>
-<div class="codehilite"><pre>    <span class="n">php</span> <span 
class="o">-</span><span class="n">v</span>
+<div class="codehilite"><pre>    <span class="p">:::</span><span 
class="n">BashLexer</span>
+    <span class="n">php</span> <span class="o">-</span><span class="n">v</span>
 </pre></div>
 
 
@@ -105,14 +106,14 @@ PHP 5.3.11 (cli) (built: May  8 2012 15:
 </li>
 <li>
 <p>Extract the phpMyAdmin package:</p>
-<div class="codehilite"><pre><span class="n">tar</span> <span 
class="n">xf</span> <span class="n">phpMyAdmin</span><span 
class="o">-</span><span class="mf">2.11.11.3</span><span 
class="o">-</span><span class="n">english</span><span class="o">.</span><span 
class="n">tar</span><span class="o">.</span><span class="n">bz2</span>
+<div class="codehilite"><pre><span class="n">tar</span> <span 
class="n">xf</span> <span class="n">phpMyAdmin</span><span 
class="o">-</span>2<span class="p">.</span>11<span class="p">.</span>11<span 
class="p">.</span>3<span class="o">-</span><span class="n">english</span><span 
class="p">.</span><span class="n">tar</span><span class="p">.</span><span 
class="n">bz2</span>
 </pre></div>
 
 
 </li>
 <li>
 <p>Move the phpMyAdmin directory to the web server directory:</p>
-<div class="codehilite"><pre><span class="n">mv</span> <span 
class="n">phpMyAdmin</span><span class="o">-</span><span 
class="mf">2.11.11.3</span><span class="o">-</span><span 
class="n">english</span> <span class="sr">/var/</span><span 
class="n">www</span><span class="sr">/html/</span><span 
class="n">phpmyadmin</span>
+<div class="codehilite"><pre><span class="n">mv</span> <span 
class="n">phpMyAdmin</span><span class="o">-</span>2<span 
class="p">.</span>11<span class="p">.</span>11<span class="p">.</span>3<span 
class="o">-</span><span class="n">english</span> <span class="o">/</span><span 
class="n">var</span><span class="o">/</span><span class="n">www</span><span 
class="o">/</span><span class="n">html</span><span class="o">/</span><span 
class="n">phpmyadmin</span>
 </pre></div>
 
 
@@ -135,7 +136,7 @@ provided in the mysql directory in the A
 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.</p>
 <p>Import the SQL file into the phpmyadmin database:</p>
-<div class="codehilite"><pre><span class="n">mysql</span> <span 
class="n">phpmyadmin</span> <span class="o">&lt;</span> <span 
class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span 
class="o">-</span><span class="mf">2.3.2</span><span 
class="sr">/mysql/</span><span class="n">phpmyadmin</span><span 
class="o">.</span><span class="n">sql</span>
+<div class="codehilite"><pre><span class="n">mysql</span> <span 
class="n">phpmyadmin</span> <span class="o">&lt;</span> <span 
class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span 
class="o">-</span>2<span class="p">.</span>3<span class="p">.</span>2<span 
class="o">/</span><span class="n">mysql</span><span class="o">/</span><span 
class="n">phpmyadmin</span><span class="p">.</span><span class="n">sql</span>
 </pre></div>
 
 

Modified: websites/staging/vcl/trunk/content/docs/localaccounts.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/localaccounts.html (original)
+++ websites/staging/vcl/trunk/content/docs/localaccounts.html Fri Feb 13 
19:07:47 2015
@@ -76,7 +76,7 @@
 account is a local VCL account. Additional local accounts can be added 
 after the backend management node component has been installed by 
 executing the vcld file with the -setup argument:</p>
-<div class="codehilite"><pre><span class="sr">/usr/</span><span 
class="nb">local</span><span class="sr">/vcl/</span><span 
class="n">bin</span><span class="o">/</span><span class="n">vcld</span> <span 
class="o">-</span><span class="n">setup</span>
+<div class="codehilite"><pre><span class="o">/</span><span 
class="n">usr</span><span class="o">/</span><span class="n">local</span><span 
class="o">/</span><span class="n">vcl</span><span class="o">/</span><span 
class="n">bin</span><span class="o">/</span><span class="n">vcld</span> <span 
class="o">-</span><span class="n">setup</span>
 </pre></div>